[folding] remove experimental flag for json/html

extensions/html-language-features/client/src/htmlMain.ts

@@ -8,7 +8,7 @@ import * as path from 'path';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { languages, ExtensionContext, IndentAction, Position, TextDocument, Range, CompletionItem, CompletionItemKind, SnippetString, FoldingRangeList, FoldingRange, workspace, FoldingContext } from 'vscode';
+import { languages, ExtensionContext, IndentAction, Position, TextDocument, Range, CompletionItem, CompletionItemKind, SnippetString, FoldingRangeList, FoldingRange, FoldingContext } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, RequestType, TextDocumentPositionParams, Disposable, CancellationToken } from 'vscode-languageclient';
 import { EMPTY_ELEMENTS } from './htmlEmptyTagsShared';
 import { activateTagClosing } from './tagClosing';
@@ -28,8 +28,6 @@ interface IPackageInfo {
 
 let telemetryReporter: TelemetryReporter | null;
 
-let foldingProviderRegistration: Disposable | undefined = void 0;
-const foldingSetting = 'html.experimental.syntaxFolding';
 
 export function activate(context: ExtensionContext) {
 	let toDispose = context.subscriptions;
@@ -83,14 +81,7 @@ export function activate(context: ExtensionContext) {
 			}
 		});
 		toDispose.push(disposable);
-
-		initFoldingProvider();
-		toDispose.push(workspace.onDidChangeConfiguration(c => {
-			if (c.affectsConfiguration(foldingSetting)) {
-				initFoldingProvider();
-			}
-		}));
-		toDispose.push({ dispose: () => foldingProviderRegistration && foldingProviderRegistration.dispose() });
+		toDispose.push(initFoldingProvider());
 	});
 
 	languages.setLanguageConfiguration('html', {
@@ -167,34 +158,24 @@ export function activate(context: ExtensionContext) {
 		}
 	});
 
-	function initFoldingProvider() {
-		let enable = workspace.getConfiguration().get(foldingSetting);
-		if (enable) {
-			if (!foldingProviderRegistration) {
-				foldingProviderRegistration = languages.registerFoldingProvider(documentSelector, {
-					provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-						const param: FoldingRangeRequestParam = {
-							textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
-							maxRanges: context.maxRanges
-						};
-						return client.sendRequest(FoldingRangesRequest.type, param, token).then(res => {
-							if (res && Array.isArray(res.ranges)) {
-								return new FoldingRangeList(res.ranges.map(r => new FoldingRange(r.startLine, r.endLine, r.type)));
-							}
-							return null;
-						}, error => {
-							client.logFailedRequest(FoldingRangesRequest.type, error);
-							return null;
-						});
+	function initFoldingProvider(): Disposable {
+		return languages.registerFoldingProvider(documentSelector, {
+			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
+				const param: FoldingRangeRequestParam = {
+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
+					maxRanges: context.maxRanges
+				};
+				return client.sendRequest(FoldingRangesRequest.type, param, token).then(res => {
+					if (res && Array.isArray(res.ranges)) {
+						return new FoldingRangeList(res.ranges.map(r => new FoldingRange(r.startLine, r.endLine, r.type)));
 					}
+					return null;
+				}, error => {
+					client.logFailedRequest(FoldingRangesRequest.type, error);
+					return null;
 				});
 			}
-		} else {
-			if (foldingProviderRegistration) {
-				foldingProviderRegistration.dispose();
-				foldingProviderRegistration = void 0;
-			}
-		}
+		});
 	}
 }
 

extensions/html-language-features/package.json

@@ -154,11 +154,6 @@
           "default": true,
           "description": "%html.autoClosingTags%"
         },
-        "html.experimental.syntaxFolding": {
-          "type": "boolean",
-          "default": false,
-          "description": "%html.experimental.syntaxFolding%"
-        },
         "html.trace.server": {
           "type": "string",
           "scope": "window",

extensions/html-language-features/package.nls.json

@@ -22,6 +22,5 @@
 	"html.trace.server.desc": "Traces the communication between VS Code and the HTML language server.",
 	"html.validate.scripts": "Configures if the built-in HTML language support validates embedded scripts.",
 	"html.validate.styles": "Configures if the built-in HTML language support validates embedded styles.",
-	"html.experimental.syntaxFolding": "Enables/disables syntax aware folding markers.",
 	"html.autoClosingTags": "Enable/disable autoclosing of HTML tags."
 }
\ No newline at end of file

extensions/json-language-features/client/src/jsonMain.ts

@@ -57,9 +57,6 @@ interface JSONSchemaSettings {
 
 let telemetryReporter: TelemetryReporter | undefined;
 
-let foldingProviderRegistration: Disposable | undefined = void 0;
-const foldingSetting = 'json.experimental.syntaxFolding';
-
 export function activate(context: ExtensionContext) {
 
 	let toDispose = context.subscriptions;
@@ -130,13 +127,7 @@ export function activate(context: ExtensionContext) {
 
 		client.sendNotification(SchemaAssociationNotification.type, getSchemaAssociation(context));
 
-		initFoldingProvider();
-		toDispose.push(workspace.onDidChangeConfiguration(c => {
-			if (c.affectsConfiguration(foldingSetting)) {
-				initFoldingProvider();
-			}
-		}));
-		toDispose.push({ dispose: () => foldingProviderRegistration && foldingProviderRegistration.dispose() });
+		toDispose.push(initFoldingProvider());
 	});
 
 	let languageConfiguration: LanguageConfiguration = {
@@ -149,34 +140,24 @@ export function activate(context: ExtensionContext) {
 	languages.setLanguageConfiguration('json', languageConfiguration);
 	languages.setLanguageConfiguration('jsonc', languageConfiguration);
 
-	function initFoldingProvider() {
-		let enable = workspace.getConfiguration().get(foldingSetting);
-		if (enable) {
-			if (!foldingProviderRegistration) {
-				foldingProviderRegistration = languages.registerFoldingProvider(documentSelector, {
-					provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
-						const param: FoldingRangeRequestParam = {
-							textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
-							maxRanges: context.maxRanges
-						};
-						return client.sendRequest(FoldingRangesRequest.type, param, token).then(res => {
-							if (res && Array.isArray(res.ranges)) {
-								return new FoldingRangeList(res.ranges.map(r => new FoldingRange(r.startLine, r.endLine, r.type)));
-							}
-							return null;
-						}, error => {
-							client.logFailedRequest(FoldingRangesRequest.type, error);
-							return null;
-						});
+	function initFoldingProvider(): Disposable {
+		return languages.registerFoldingProvider(documentSelector, {
+			provideFoldingRanges(document: TextDocument, context: FoldingContext, token: CancellationToken) {
+				const param: FoldingRangeRequestParam = {
+					textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
+					maxRanges: context.maxRanges
+				};
+				return client.sendRequest(FoldingRangesRequest.type, param, token).then(res => {
+					if (res && Array.isArray(res.ranges)) {
+						return new FoldingRangeList(res.ranges.map(r => new FoldingRange(r.startLine, r.endLine, r.type)));
 					}
+					return null;
+				}, error => {
+					client.logFailedRequest(FoldingRangesRequest.type, error);
+					return null;
 				});
 			}
-		} else {
-			if (foldingProviderRegistration) {
-				foldingProviderRegistration.dispose();
-				foldingProviderRegistration = void 0;
-			}
-		}
+		});
 	}
 }
 

extensions/json-language-features/package.json

@@ -85,11 +85,6 @@
           "default": true,
           "description": "%json.colorDecorators.enable.desc%",
           "deprecationMessage": "%json.colorDecorators.enable.deprecationMessage%"
-        },
-        "json.experimental.syntaxFolding": {
-          "type": "boolean",
-          "default": false,
-          "description": "%json.experimental.syntaxFolding%"
         }
       }
     },

extensions/json-language-features/package.nls.json

@@ -9,6 +9,5 @@
 	"json.format.enable.desc": "Enable/disable default JSON formatter (requires restart)",
 	"json.tracing.desc": "Traces the communication between VS Code and the JSON language server.",
 	"json.colorDecorators.enable.desc": "Enables or disables color decorators",
-	"json.colorDecorators.enable.deprecationMessage": "The setting `json.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`.",
-	"json.experimental.syntaxFolding": "Enables/disables syntax aware folding markers."
+	"json.colorDecorators.enable.deprecationMessage": "The setting `json.colorDecorators.enable` has been deprecated in favor of `editor.colorDecorators`."
 }
\ No newline at end of file