Merge pull request #67014 from Microsoft/octref/html-selection

Html semantic selection. Part of #65925

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

@@ -8,8 +8,8 @@ import * as fs from 'fs';
 import * as nls from 'vscode-nls';
 const localize = nls.loadMessageBundle();
 
-import { languages, ExtensionContext, IndentAction, Position, TextDocument, Range, CompletionItem, CompletionItemKind, SnippetString, workspace } from 'vscode';
-import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, RequestType, TextDocumentPositionParams } from 'vscode-languageclient';
+import { languages, ExtensionContext, IndentAction, Position, TextDocument, Range, CompletionItem, CompletionItemKind, SnippetString, workspace, SelectionRange, SelectionRangeKind } from 'vscode';
+import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, RequestType, TextDocumentPositionParams, TextDocumentIdentifier } from 'vscode-languageclient';
 import { EMPTY_ELEMENTS } from './htmlEmptyTagsShared';
 import { activateTagClosing } from './tagClosing';
 import TelemetryReporter from 'vscode-extension-telemetry';
@@ -86,6 +86,21 @@ export function activate(context: ExtensionContext) {
 		toDispose.push(disposable);
 	});
 
+	languages.registerSelectionRangeProvider('html', {
+		async provideSelectionRanges(document: TextDocument, position: Position): Promise<SelectionRange[]> {
+			const textDocument = TextDocumentIdentifier.create(document.uri.toString());
+			const rawRanges: Range[] = await client.sendRequest('$/textDocument/selectionRange', { textDocument, position });
+
+			return rawRanges.map(r => {
+				const actualRange = new Range(new Position(r.start.line, r.start.character), new Position(r.end.line, r.end.character));
+				return {
+					range: actualRange,
+					kind: SelectionRangeKind.Declaration
+				};
+			});
+		}
+	});
+
 	languages.setLanguageConfiguration('html', {
 		indentationRules: {
 			increaseIndentPattern: /<(?!\?|(?:area|base|br|col|frame|hr|html|img|input|link|meta|param)\b|[^>]*\/>)([-_\.A-Za-z0-9]+)(?=\s|>)\b[^>]*>(?!.*<\/\1>)|<!--(?!.*-->)|\{[^}"']*$/,

extensions/html-language-features/package.json

 {
+  "enableProposedApi": true,
   "name": "html-language-features",
   "displayName": "%displayName%",
   "description": "%description%",

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

@@ -10,7 +10,7 @@
   "main": "./out/htmlServerMain",
   "dependencies": {
     "vscode-css-languageservice": "^3.0.13-next.6",
-    "vscode-html-languageservice": "^2.1.11-next.3",
+    "vscode-html-languageservice": "^2.1.11-next.4",
     "vscode-languageserver": "^5.1.0",
     "vscode-languageserver-types": "^3.13.0",
     "vscode-nls": "^4.0.0",

extensions/html-language-features/server/src/htmlServerMain.ts

@@ -480,6 +480,19 @@ connection.onFoldingRanges((params, token) => {
 	}, null, `Error while computing folding regions for ${params.textDocument.uri}`, token);
 });
 
+connection.onRequest('$/textDocument/selectionRange', async (params) => {
+	const document = documents.get(params.textDocument.uri);
+	const position: Position = params.position;
+
+	if (document) {
+		const htmlMode = languageModes.getMode('html');
+		if (htmlMode && htmlMode.doSelection) {
+			return htmlMode.doSelection(document, position);
+		}
+	}
+	return Promise.resolve(null);
+});
+
 
 // Listen on the connection
 connection.listen();
\ No newline at end of file

extensions/html-language-features/server/src/modes/htmlMode.ts

@@ -15,6 +15,9 @@ export function getHTMLMode(htmlLanguageService: HTMLLanguageService, workspace:
 		getId() {
 			return 'html';
 		},
+		doSelection(document: TextDocument, position: Position): Range[] {
+			return htmlLanguageService.getSelectionRanges(document, position);
+		},
 		doComplete(document: TextDocument, position: Position, settings = workspace.settings) {
 			let options = settings && settings.html && settings.html.suggest;
 			let doAutoComplete = settings && settings.html && settings.html.autoClosingTags;

extensions/html-language-features/server/src/modes/languageModes.ts

@@ -31,6 +31,7 @@ export interface Workspace {
 
 export interface LanguageMode {
 	getId(): string;
+	doSelection?: (document: TextDocument, position: Position) => Range[];
 	doValidation?: (document: TextDocument, settings?: Settings) => Diagnostic[];
 	doComplete?: (document: TextDocument, position: Position, settings?: Settings) => CompletionList;
 	doResolve?: (document: TextDocument, item: CompletionItem) => CompletionItem;

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

@@ -237,10 +237,10 @@ vscode-css-languageservice@^3.0.13-next.6:
     vscode-languageserver-types "^3.13.0"
     vscode-nls "^4.0.0"
 
-vscode-html-languageservice@^2.1.11-next.3:
-  version "2.1.11-next.3"
-  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.11-next.3.tgz#f8eaee042c161f47fb71850c558428d0d91c881f"
-  integrity sha512-621+f1nbRvMgLyvW1Aa9shZ9r9qBIXMi4fF8o0voooHjIggrIbstUpYmaQIFRNill3b9HCNdluTZnAQlQGU6Ew==
+vscode-html-languageservice@^2.1.11-next.4:
+  version "2.1.11-next.4"
+  resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-2.1.11-next.4.tgz#bcfe68ca17300d7f845889be3cb947af95dab409"
+  integrity sha512-dQOcdqLhMZuAWhSoe/AqqvVo2klkWpCHwp14dWvgrAfUyKM7l0e0kk9lbf8kt1Kn2J9ukDTySIcOkbHaVSwcHA==
   dependencies:
     vscode-languageserver-types "^3.13.0"
     vscode-nls "^4.0.0"