Merge pull request #46117 from Microsoft/octref/cssFolding

[WIP] CSS Folding

extensions/css-language-features/client/src/cssMain.ts

@@ -8,8 +8,9 @@ import * as path from 'path';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { languages, window, commands, ExtensionContext, Range, Position, CompletionItem, CompletionItemKind, TextEdit, SnippetString } from 'vscode';
+import { languages, window, commands, ExtensionContext, Range, Position, TextDocument, CompletionItem, CompletionItemKind, TextEdit, SnippetString, FoldingRangeList, FoldingRange, FoldingContext, CancellationToken } from 'vscode';
 import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind } from 'vscode-languageclient';
+import { FoldingRangesRequest, FoldingRangeRequestParam } from 'vscode-languageserver-protocol-foldingprovider';
 
 // this method is called when vs code is activated
 export function activate(context: ExtensionContext) {
@@ -92,6 +93,24 @@ export function activate(context: ExtensionContext) {
 		}
 	});
 
+	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;
+			});
+		}
+	});
+
 	commands.registerCommand('_css.applyCodeAction', applyCodeAction);
 
 	function applyCodeAction(uri: string, documentVersion: number, edits: TextEdit[]) {

extensions/css-language-features/client/tsconfig.json

@@ -4,6 +4,7 @@
 		"module": "commonjs",
 		"outDir": "./out",
 		"noUnusedLocals": true,
+		"sourceMap": true,
 		"lib": [
 			"es2016"
 		],

extensions/css-language-features/package.json

 {
   "name": "css-language-features",
-	"displayName": "%displayName%",
-	"description": "%description%",
+  "displayName": "%displayName%",
+  "description": "%description%",
   "version": "1.0.0",
   "publisher": "vscode",
   "engines": {
@@ -692,7 +692,8 @@
     ]
   },
   "dependencies": {
-    "vscode-languageclient": "4.0.0-next.9",
+    "vscode-languageclient": "^4.0.0",
+    "vscode-languageserver-protocol-foldingprovider": "^1.0.1",
     "vscode-nls": "^3.2.1"
   },
   "devDependencies": {

extensions/css-language-features/server/package.json

@@ -10,7 +10,8 @@
   "dependencies": {
     "vscode-css-languageservice": "^3.0.9-next.1",
     "vscode-emmet-helper": "^1.2.0",
-    "vscode-languageserver": "^4.0.0"
+    "vscode-languageserver": "^4.0.0",
+    "vscode-languageserver-protocol-foldingprovider": "^1.0.1"
   },
   "devDependencies": {
     "@types/mocha": "2.2.33",

extensions/css-language-features/server/src/cssServerMain.ts

@@ -16,6 +16,7 @@ import { getLanguageModelCache } from './languageModelCache';
 import { formatError, runSafe } from './utils/errors';
 import URI from 'vscode-uri';
 import { getPathCompletionParticipant } from './pathCompletion';
+import { FoldingProviderServerCapabilities, FoldingRangesRequest } from 'vscode-languageserver-protocol-foldingprovider';
 
 export interface Settings {
 	css: LanguageSettings;
@@ -72,7 +73,8 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 	}
 	let snippetSupport = hasClientCapability('textDocument.completion.completionItem.snippetSupport');
 	scopedSettingsSupport = hasClientCapability('workspace.configuration');
-	let capabilities: ServerCapabilities = {
+
+	let capabilities: ServerCapabilities & FoldingProviderServerCapabilities = {
 		// Tell the client that the server works in FULL text document sync mode
 		textDocumentSync: documents.syncKind,
 		completionProvider: snippetSupport ? { resolveProvider: false } : undefined,
@@ -83,7 +85,8 @@ connection.onInitialize((params: InitializeParams): InitializeResult => {
 		documentHighlightProvider: true,
 		codeActionProvider: true,
 		renameProvider: true,
-		colorProvider: true
+		colorProvider: true,
+		foldingProvider: true
 	};
 	return { capabilities };
 });
@@ -274,5 +277,13 @@ connection.onRenameRequest(renameParameters => {
 	}, null, `Error while computing renames for ${renameParameters.textDocument.uri}`);
 });
 
+connection.onRequest(FoldingRangesRequest.type, (params, token) => {
+	return runSafe(() => {
+		let document = documents.get(params[0].textDocument.uri);
+		let stylesheet = stylesheets.get(document);
+		return getLanguageService(document).findFoldingRegions(document, stylesheet);
+	}, null, `Error while computing folding ranges for ${params[0].textDocument.uri}`);
+});
+
 // Listen on the connection
 connection.listen();
\ No newline at end of file

extensions/css-language-features/server/yarn.lock

@@ -37,6 +37,13 @@ vscode-jsonrpc@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4"
 
+vscode-languageserver-protocol-foldingprovider@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-1.0.1.tgz#85514aaf8fe905e91bf21e4106e0847f60d40f44"
+  dependencies:
+    vscode-languageserver-protocol "^3.6.0"
+    vscode-languageserver-types "^3.6.0"
+
 vscode-languageserver-protocol@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz#579642cdcccf74b0cd771c33daa3239acb40d040"

extensions/css-language-features/yarn.lock

@@ -6,26 +6,33 @@
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
-vscode-jsonrpc@^3.6.0-next.1:
-  version "3.6.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0-next.1.tgz#3cb463dffe5842d6aec16718ca9252708cd6aabe"
+vscode-jsonrpc@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-3.6.0.tgz#848d56995d5168950d84feb5d9c237ae5c6a02d4"
 
-vscode-languageclient@4.0.0-next.9:
-  version "4.0.0-next.9"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0-next.9.tgz#2a06568f46ee9de3490f85e227d3740a21a03d3a"
+vscode-languageclient@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-4.0.0.tgz#635f5bfbcfa1385dae489b394857f1db8b459a7d"
   dependencies:
-    vscode-languageserver-protocol "^3.6.0-next.5"
+    vscode-languageserver-protocol "^3.6.0"
 
-vscode-languageserver-protocol@^3.6.0-next.5:
-  version "3.6.0-next.5"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0-next.5.tgz#ed2ec2db759826f753c0a13977dfb2bedc4d31b3"
+vscode-languageserver-protocol-foldingprovider@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-1.0.1.tgz#85514aaf8fe905e91bf21e4106e0847f60d40f44"
   dependencies:
-    vscode-jsonrpc "^3.6.0-next.1"
-    vscode-languageserver-types "^3.6.0-next.1"
+    vscode-languageserver-protocol "^3.6.0"
+    vscode-languageserver-types "^3.6.0"
 
-vscode-languageserver-types@^3.6.0-next.1:
-  version "3.6.0-next.1"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0-next.1.tgz#98e488d3f87b666b4ee1a3d89f0023e246d358f3"
+vscode-languageserver-protocol@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.6.0.tgz#579642cdcccf74b0cd771c33daa3239acb40d040"
+  dependencies:
+    vscode-jsonrpc "^3.6.0"
+    vscode-languageserver-types "^3.6.0"
+
+vscode-languageserver-types@^3.6.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.6.1.tgz#4bc06a48dff653495f12f94b8b1e228988a1748d"
 
 vscode-nls@^3.2.1:
   version "3.2.1"