FoldingRules language configuration simplification

aeschli · aeschli · commit a678f60100ef · 2017-09-22T13:50:03.000+02:00
diff --git a/extensions/clojure/language-configuration.json b/extensions/clojure/language-configuration.json
@@ -20,8 +20,6 @@
 		["\"", "\""]
 	],
 	"folding": {
-		"indendationBasedFolding": {
-			"offSide": true
-		}
+		"offSide": true
 	}
 }
diff --git a/extensions/coffeescript/language-configuration.json b/extensions/coffeescript/language-configuration.json
@@ -23,8 +23,6 @@
 		["'", "'"]
 	],
 	"folding": {
-		"indendationBasedFolding": {
-			"offSide": true
-		}
+		"offSide": true
 	}
 }
diff --git a/extensions/fsharp/language-configuration.json b/extensions/fsharp/language-configuration.json
@@ -22,8 +22,6 @@
 		["'", "'"]
 	],
 	"folding": {
-		"indendationBasedFolding": {
-			"offSide": true
-		}
+		"offSide": true
 	}
 }
diff --git a/extensions/markdown/language-configuration.json b/extensions/markdown/language-configuration.json
@@ -39,8 +39,6 @@
 		["`", "`"]
 	],
 	"folding": {
-		"indendationBasedFolding": {
-			"offSide": true
-		}
+		"offSide": true
 	}
 }
diff --git a/extensions/pug/language-configuration.json b/extensions/pug/language-configuration.json
@@ -22,8 +22,6 @@
 		["\"", "\""]
 	],
 	"folding": {
-		"indendationBasedFolding": {
-			"offSide": true
-		}
+		"offSide": true
 	}
 }
diff --git a/extensions/python/language-configuration.json b/extensions/python/language-configuration.json
@@ -23,8 +23,6 @@
 		["'", "'"]
 	],
 	"folding": {
-		"indendationBasedFolding": {
-			"offSide": true
-		}
+		"offSide": true
 	}
 }
diff --git a/extensions/yaml/language-configuration.json b/extensions/yaml/language-configuration.json
@@ -22,8 +22,6 @@
 		["'", "'"]
 	],
 	"folding": {
-		"indendationBasedFolding": {
-			"offSide": true
-		}
+		"offSide": true
 	}
 }
diff --git a/src/vs/editor/common/model/textModelWithTokens.ts b/src/vs/editor/common/model/textModelWithTokens.ts
@@ -844,8 +844,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
 	private _getIndentRanges(): IndentRange[] {
 		if (!this._indentRanges) {
 			let foldingRules = LanguageConfigurationRegistry.getFoldingRules(this._languageIdentifier.id);
-			let offSide = foldingRules && foldingRules.indendationBasedFolding && foldingRules.indendationBasedFolding.offSide;
-			this._indentRanges = computeRanges(this, offSide);
+			let offSide = foldingRules && foldingRules.offSide;
 		}
 		return this._indentRanges;
 	}
diff --git a/src/vs/editor/common/modes/languageConfiguration.ts b/src/vs/editor/common/modes/languageConfiguration.ts
@@ -102,18 +102,15 @@ export interface IndentationRule {
  * Describes folding rules for a language.
  */
 export interface FoldingRules {
-	indendationBasedFolding?: {
-		/**
-		 * Used by the indentation based strategy to decide wheter empty lines belong to the previous or the next block.
-		 * A language adheres to the off-side rule if blocks in that language are expressed by their indentation.
-		 * See [wikipedia](https://en.wikipedia.org/wiki/Off-side_rule) for more information.
-		 * If not set, `false` is used and empty lines belong to the previous block.
-		 */
-		offSide: boolean;
-	};
+	/**
+	 * Used by the indentation based strategy to decide wheter empty lines belong to the previous or the next block.
+	 * A language adheres to the off-side rule if blocks in that language are expressed by their indentation.
+	 * See [wikipedia](https://en.wikipedia.org/wiki/Off-side_rule) for more information.
+	 * If not set, `false` is used and empty lines belong to the previous block.
+	 */
+	offSide?: boolean;
 }
 
-
 /**
  * Describes a rule to be evaluated when pressing Enter.
  */
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -4365,15 +4365,13 @@ declare module monaco.languages {
 	 * Describes folding rules for a language.
 	 */
 	export interface FoldingRules {
-		indendationBasedFolding?: {
-			/**
-			 * Used by the indentation based strategy to decide wheter empty lines belong to the previous or the next block.
-			 * A language adheres to the off-side rule if blocks in that language are expressed by their indentation.
-			 * See [wikipedia](https://en.wikipedia.org/wiki/Off-side_rule) for more information.
-			 * If not set, `false` is used and empty lines belong to the previous block.
-			 */
-			offSide: boolean;
-		};
+		/**
+		 * Used by the indentation based strategy to decide wheter empty lines belong to the previous or the next block.
+		 * A language adheres to the off-side rule if blocks in that language are expressed by their indentation.
+		 * See [wikipedia](https://en.wikipedia.org/wiki/Off-side_rule) for more information.
+		 * If not set, `false` is used and empty lines belong to the previous block.
+		 */
+		offSide?: boolean;
 	}
 
 	/**
diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts b/src/vs/workbench/parts/codeEditor/electron-browser/languageConfiguration/languageConfigurationExtensionPoint.ts
@@ -387,15 +387,9 @@ const schema: IJSONSchema = {
 			type: 'object',
 			description: nls.localize('schema.folding', 'The language\'s folding settings.'),
 			properties: {
-				indendationBasedFolding: {
-					type: 'object',
-					description: nls.localize('schema.folding.indendationBasedFolding', 'Settings for indentation based folding.'),
-					properties: {
-						offSide: {
-							type: 'boolean',
-							description: nls.localize('schema.folding.indendationBasedFolding.offSide', 'A language adheres to the off-side rule if blocks in that language are expressed by their indentation. If set, empty lines belong to the subsequent block.'),
-						}
-					}
+				offSide: {
+					type: 'boolean',
+					description: nls.localize('schema.folding.offSide', 'A language adheres to the off-side rule if blocks in that language are expressed by their indentation. If set, empty lines belong to the subsequent block.'),
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`["\"", "\""]`
`21`	`21`	`],`
`22`	`22`	`"folding": {`
`23`		`- "indendationBasedFolding": {`
`24`		`- "offSide": true`
`25`		`- }`
	`23`	`+ "offSide": true`
`26`	`24`	`}`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`	`["'", "'"]`
`24`	`24`	`],`
`25`	`25`	`"folding": {`
`26`		`- "indendationBasedFolding": {`
`27`		`- "offSide": true`
`28`		`- }`
	`26`	`+ "offSide": true`
`29`	`27`	`}`
`30`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@`
`22`	`22`	`["'", "'"]`
`23`	`23`	`],`
`24`	`24`	`"folding": {`
`25`		`- "indendationBasedFolding": {`
`26`		`- "offSide": true`
`27`		`- }`
	`25`	`+ "offSide": true`
`28`	`26`	`}`
`29`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@`
`39`	`39`	["`", "`"]
`40`	`40`	`],`
`41`	`41`	`"folding": {`
`42`		`- "indendationBasedFolding": {`
`43`		`- "offSide": true`
`44`		`- }`
	`42`	`+ "offSide": true`
`45`	`43`	`}`
`46`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -844,8 +844,7 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke`
`844`	`844`	`private _getIndentRanges(): IndentRange[] {`
`845`	`845`	`if (!this._indentRanges) {`
`846`	`846`	`let foldingRules = LanguageConfigurationRegistry.getFoldingRules(this._languageIdentifier.id);`
`847`		`- let offSide = foldingRules && foldingRules.indendationBasedFolding && foldingRules.indendationBasedFolding.offSide;`
`848`		`- this._indentRanges = computeRanges(this, offSide);`
	`847`	`+ let offSide = foldingRules && foldingRules.offSide;`
`849`	`848`	`}`
`850`	`849`	`return this._indentRanges;`
`851`	`850`	`}`