Skip to content

Commit

Permalink
Typo fix (emtpy -> empty)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gama11
Gama11 committed Aug 20, 2018
1 parent 50dbf5f commit 0f40857
Show file tree
Hide file tree
Showing 7 changed files with 132 additions and 132 deletions.
202 changes: 101 additions & 101 deletions resources/formatter-schema.json
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,6 @@
{
"$schema": "http://json-schema.org/schema#",
"definitions": {
"ConditionalEmtpyLinesConfig": {
"additionalProperties": false,
"properties": {
"afterElse": {
"type": "integer",
"propertyOrder": 2
},
"afterIf": {
"type": "integer",
"propertyOrder": 0
},
"beforeElse": {
"type": "integer",
"propertyOrder": 1
},
"beforeEnd": {
"type": "integer",
"propertyOrder": 3
},
"beforeError": {
"type": "integer",
"propertyOrder": 4
},
"afterError": {
"type": "integer",
"propertyOrder": 5
}
},
"type": "object"
},
"LineEndConfig": {
"additionalProperties": false,
"properties": {
Expand Down Expand Up @@ -121,20 +91,6 @@
},
"type": "object"
},
"TypedefFieldsEmtpyLinesConfig": {
"additionalProperties": false,
"properties": {
"beginType": {
"type": "integer",
"propertyOrder": 0
},
"betweenFields": {
"type": "integer",
"propertyOrder": 1
}
},
"type": "object"
},
"IndentationConfig": {
"additionalProperties": false,
"properties": {
Expand All @@ -161,7 +117,7 @@
},
"type": "object"
},
"InterfaceFieldsEmtpyLinesConfig": {
"EnumAbstractFieldsEmptyLinesConfig": {
"additionalProperties": false,
"properties": {
"beginType": {
Expand All @@ -183,52 +139,6 @@
},
"type": "object"
},
"ClassFieldsEmtpyLinesConfig": {
"additionalProperties": false,
"properties": {
"beginType": {
"type": "integer",
"propertyOrder": 0
},
"afterStaticFunctions": {
"type": "integer",
"propertyOrder": 6
},
"betweenStaticFunctions": {
"type": "integer",
"propertyOrder": 7
},
"betweenVars": {
"type": "integer",
"propertyOrder": 4
},
"afterStaticVars": {
"type": "integer",
"propertyOrder": 2
},
"betweenFunctions": {
"type": "integer",
"propertyOrder": 9
},
"afterVars": {
"type": "integer",
"propertyOrder": 5
},
"afterPrivateFunctions": {
"type": "integer",
"propertyOrder": 8
},
"afterPrivateVars": {
"type": "integer",
"propertyOrder": 3
},
"betweenStaticVars": {
"type": "integer",
"propertyOrder": 1
}
},
"type": "object"
},
"WrapCondition": {
"required": [
"cond"
Expand Down Expand Up @@ -256,6 +166,20 @@
},
"type": "object"
},
"TypedefFieldsEmptyLinesConfig": {
"additionalProperties": false,
"properties": {
"beginType": {
"type": "integer",
"propertyOrder": 0
},
"betweenFields": {
"type": "integer",
"propertyOrder": 1
}
},
"type": "object"
},
"WrapRule": {
"required": [
"conditions",
Expand Down Expand Up @@ -297,7 +221,7 @@
"propertyOrder": 0
},
"excludes": {
"description": "regular expressions matching files to exclude from formatting",
"description": "regular expressions matching files to exclude from formatting\n\t\tdefault ist to exclude any \".haxelib\" folder",
"items": {
"type": "string"
},
Expand Down Expand Up @@ -380,7 +304,7 @@
"propertyOrder": 9
},
"conditionalsEmptyLines": {
"$ref": "#/definitions/ConditionalEmtpyLinesConfig",
"$ref": "#/definitions/ConditionalEmptyLinesConfig",
"propertyOrder": 18
},
"afterBlocks": {
Expand All @@ -392,11 +316,11 @@
"propertyOrder": 10
},
"enumEmptyLines": {
"$ref": "#/definitions/TypedefFieldsEmtpyLinesConfig",
"$ref": "#/definitions/TypedefFieldsEmptyLinesConfig",
"propertyOrder": 16
},
"externClassEmptyLines": {
"$ref": "#/definitions/InterfaceFieldsEmtpyLinesConfig",
"$ref": "#/definitions/InterfaceFieldsEmptyLinesConfig",
"propertyOrder": 13
},
"betweenTypes": {
Expand All @@ -414,23 +338,23 @@
"propertyOrder": 1
},
"typedefEmptyLines": {
"$ref": "#/definitions/TypedefFieldsEmtpyLinesConfig",
"$ref": "#/definitions/TypedefFieldsEmptyLinesConfig",
"propertyOrder": 17
},
"enumAbstractEmptyLines": {
"$ref": "#/definitions/EnumAbstractFieldsEmtpyLinesConfig",
"$ref": "#/definitions/EnumAbstractFieldsEmptyLinesConfig",
"propertyOrder": 11
},
"abstractEmptyLines": {
"$ref": "#/definitions/ClassFieldsEmtpyLinesConfig",
"$ref": "#/definitions/ClassFieldsEmptyLinesConfig",
"propertyOrder": 14
},
"afterImportsUsing": {
"type": "integer",
"propertyOrder": 4
},
"classEmptyLines": {
"$ref": "#/definitions/ClassFieldsEmtpyLinesConfig",
"$ref": "#/definitions/ClassFieldsEmptyLinesConfig",
"propertyOrder": 12
},
"beforeDocCommentEmptyLines": {
Expand All @@ -444,13 +368,89 @@
"propertyOrder": 19
},
"interfaceEmptyLines": {
"$ref": "#/definitions/InterfaceFieldsEmtpyLinesConfig",
"$ref": "#/definitions/InterfaceFieldsEmptyLinesConfig",
"propertyOrder": 15
}
},
"type": "object"
},
"EnumAbstractFieldsEmtpyLinesConfig": {
"ClassFieldsEmptyLinesConfig": {
"additionalProperties": false,
"properties": {
"beginType": {
"type": "integer",
"propertyOrder": 0
},
"afterStaticFunctions": {
"type": "integer",
"propertyOrder": 6
},
"betweenStaticFunctions": {
"type": "integer",
"propertyOrder": 7
},
"betweenVars": {
"type": "integer",
"propertyOrder": 4
},
"afterStaticVars": {
"type": "integer",
"propertyOrder": 2
},
"betweenFunctions": {
"type": "integer",
"propertyOrder": 9
},
"afterVars": {
"type": "integer",
"propertyOrder": 5
},
"afterPrivateFunctions": {
"type": "integer",
"propertyOrder": 8
},
"afterPrivateVars": {
"type": "integer",
"propertyOrder": 3
},
"betweenStaticVars": {
"type": "integer",
"propertyOrder": 1
}
},
"type": "object"
},
"ConditionalEmptyLinesConfig": {
"additionalProperties": false,
"properties": {
"afterElse": {
"type": "integer",
"propertyOrder": 2
},
"afterIf": {
"type": "integer",
"propertyOrder": 0
},
"beforeElse": {
"type": "integer",
"propertyOrder": 1
},
"beforeEnd": {
"type": "integer",
"propertyOrder": 3
},
"beforeError": {
"type": "integer",
"propertyOrder": 4
},
"afterError": {
"type": "integer",
"propertyOrder": 5
}
},
"type": "object"
},
"InterfaceFieldsEmptyLinesConfig": {
"additionalProperties": false,
"properties": {
"beginType": {
Expand Down
26 changes: 13 additions & 13 deletions src/formatter/config/EmptyLinesConfig.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ typedef EmptyLinesConfig = {
@:default(Remove) @:optional var afterReturn:KeepEmptyLinesPolicy;
@:default(Remove) @:optional var beforeBlocks:KeepEmptyLinesPolicy;
@:default(Remove) @:optional var afterBlocks:KeepEmptyLinesPolicy;
@:default(auto) @:optional var enumAbstractEmptyLines:EnumAbstractFieldsEmtpyLinesConfig;
@:default(auto) @:optional var classEmptyLines:ClassFieldsEmtpyLinesConfig;
@:default(auto) @:optional var externClassEmptyLines:InterfaceFieldsEmtpyLinesConfig;
@:default(auto) @:optional var abstractEmptyLines:ClassFieldsEmtpyLinesConfig;
@:default(auto) @:optional var interfaceEmptyLines:InterfaceFieldsEmtpyLinesConfig;
@:default(auto) @:optional var enumEmptyLines:TypedefFieldsEmtpyLinesConfig;
@:default(auto) @:optional var typedefEmptyLines:TypedefFieldsEmtpyLinesConfig;
@:default(auto) @:optional var conditionalsEmptyLines:ConditionalEmtpyLinesConfig;
@:default(auto) @:optional var enumAbstractEmptyLines:EnumAbstractFieldsEmptyLinesConfig;
@:default(auto) @:optional var classEmptyLines:ClassFieldsEmptyLinesConfig;
@:default(auto) @:optional var externClassEmptyLines:InterfaceFieldsEmptyLinesConfig;
@:default(auto) @:optional var abstractEmptyLines:ClassFieldsEmptyLinesConfig;
@:default(auto) @:optional var interfaceEmptyLines:InterfaceFieldsEmptyLinesConfig;
@:default(auto) @:optional var enumEmptyLines:TypedefFieldsEmptyLinesConfig;
@:default(auto) @:optional var typedefEmptyLines:TypedefFieldsEmptyLinesConfig;
@:default(auto) @:optional var conditionalsEmptyLines:ConditionalEmptyLinesConfig;

/**
"one" adds one empty line above doc comments
Expand All @@ -56,7 +56,7 @@ typedef EmptyLinesConfig = {
@:default(One) @:optional var beforeDocCommentEmptyLines:CommentEmptyLinesPolicy;
}

typedef ConditionalEmtpyLinesConfig = {
typedef ConditionalEmptyLinesConfig = {
@:default(0) @:optional var afterIf:Int;
@:default(0) @:optional var beforeElse:Int;
@:default(0) @:optional var afterElse:Int;
Expand All @@ -65,7 +65,7 @@ typedef ConditionalEmtpyLinesConfig = {
@:default(0) @:optional var afterError:Int;
}

typedef ClassFieldsEmtpyLinesConfig = {
typedef ClassFieldsEmptyLinesConfig = {
@:default(0) @:optional var beginType:Int;
@:default(0) @:optional var betweenStaticVars:Int;
@:default(1) @:optional var afterStaticVars:Int;
Expand All @@ -78,21 +78,21 @@ typedef ClassFieldsEmtpyLinesConfig = {
@:default(1) @:optional var betweenFunctions:Int;
}

typedef EnumAbstractFieldsEmtpyLinesConfig = {
typedef EnumAbstractFieldsEmptyLinesConfig = {
@:default(0) @:optional var beginType:Int;
@:default(0) @:optional var betweenVars:Int;
@:default(1) @:optional var afterVars:Int;
@:default(1) @:optional var betweenFunctions:Int;
}

typedef InterfaceFieldsEmtpyLinesConfig = {
typedef InterfaceFieldsEmptyLinesConfig = {
@:default(0) @:optional var beginType:Int;
@:default(0) @:optional var betweenVars:Int;
@:default(0) @:optional var afterVars:Int;
@:default(0) @:optional var betweenFunctions:Int;
}

typedef TypedefFieldsEmtpyLinesConfig = {
typedef TypedefFieldsEmptyLinesConfig = {
@:default(0) @:optional var beginType:Int;
@:default(0) @:optional var betweenFields:Int;
}
Expand Down
Loading

0 comments on commit 0f40857

Please sign in to comment.