Merge pull request #67261 from Microsoft/aeschli/json-semantic-selection

[json] semantic selection
microsoft · Jan 28, 2019 · 7ff3173 · 7ff3173
2 parents 43c36fb + 1972f79
commit 7ff3173
Show file tree

Hide file tree

Showing 13 changed files with 82 additions and 2,311 deletions.
diff --git a/extensions/css-language-features/client/src/cssMain.ts b/extensions/css-language-features/client/src/cssMain.ts
@@ -78,6 +78,24 @@ export function activate(context: ExtensionContext) {
 
  client.onReady().then(() => {
  context.subscriptions.push(initCompletionProvider());
+
+ documentSelector.forEach(selector => {
+ context.subscriptions.push(languages.registerSelectionRangeProvider(selector, {
+ async provideSelectionRanges(document: TextDocument, position: Position): Promise<SelectionRange[]> {
+ const textDocument = client.code2ProtocolConverter.asTextDocumentIdentifier(document);
+ const rawRanges = await client.sendRequest<Range[]>('$/textDocument/selectionRange', { textDocument, position });
+ if (Array.isArray(rawRanges)) {
+ return rawRanges.map(r => {
+ return {
+ range: client.protocol2CodeConverter.asRange(r),
+ kind: SelectionRangeKind.Declaration
+ };
+ });
+ }
+ return [];
+ }
+ }));
+ });
  });
 
  const selectionRangeProvider = {
@@ -94,9 +112,9 @@ export function activate(context: ExtensionContext) {
  });
  }
  };
- languages.registerSelectionRangeProvider('css', selectionRangeProvider);
- languages.registerSelectionRangeProvider('less', selectionRangeProvider);
- languages.registerSelectionRangeProvider('scss', selectionRangeProvider);
+ documentSelector.forEach(selector => {
+  languages.registerSelectionRangeProvider(selector, selectionRangeProvider);
+ });
 
  function initCompletionProvider(): Disposable {
  const regionCompletionRegExpr = /^(\s*)(\/(\*\s*(#\w*)?)?)?$/;

diff --git a/extensions/css-language-features/client/src/typings/ref.d.ts b/extensions/css-language-features/client/src/typings/ref.d.ts
@@ -2,5 +2,5 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-
 /// <reference path='../../../../../src/vs/vscode.d.ts'/>
+/// <reference path="../../../../../src/vs/vscode.proposed.d.ts" />