Merge pull request #2366 from yoyo930021/remove-deprecated

Remove deprecated code and incremental text document

Author: yoyo930021

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - 🙌 Fix v-bind modifiers causing TypeScript to not find type-checked template props correctly. Thanks to contribution from [@andrewisaburden](https://github.com/andrewisaburden). #2430.
 - 🙌 Fix "File name X differs from already included file name Y only in casing" on Windows. Thanks to contribution from [@rchl](https://github.com/rchl). #2433 and #2444.
+- 🙌 Remove deprecated code and incremental text document. Thanks to contribution from [@yoyo930021](https://github.com/yoyo930021). #2366.
 
 ### 0.29.1 | 2020-11-08 | [VSIX](https://marketplace.visualstudio.com/_apis/public/gallery/publishers/octref/vsextensions/vetur/0.29.1/vspackage)
 

server/src/embeddedSupport/embeddedSupport.ts

@@ -1,4 +1,5 @@
-import { TextDocument, Position, Range } from 'vscode-languageserver-types';
+import { Position, Range } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 import { parseVueDocumentRegions, EmbeddedRegion } from './vueDocumentRegionParser';
 
 export type LanguageId =

server/src/embeddedSupport/languageModelCache.ts

@@ -1,4 +1,4 @@
-import { TextDocument } from 'vscode-languageserver';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 
 export interface LanguageModelCache<T> {
   /**

server/src/embeddedSupport/languageModes.ts

@@ -4,7 +4,6 @@ import {
   SignatureHelp,
   Definition,
   TextEdit,
-  TextDocument,
   Diagnostic,
   DocumentLink,
   Range,
@@ -22,6 +21,7 @@ import {
   WorkspaceEdit,
   FoldingRange
 } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 import { getLanguageModelCache, LanguageModelCache } from './languageModelCache';
 import { getVueDocumentRegions, VueDocumentRegions, LanguageId, LanguageRange } from './embeddedSupport';

server/src/embeddedSupport/test/embeddedSupport.test.ts

@@ -1,4 +1,4 @@
-import { TextDocument } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 import * as assert from 'assert';
 import { parseVueDocumentRegions } from '../vueDocumentRegionParser';
 import { getSingleLanguageDocument, getSingleTypeDocument, getLanguageRangesOfType } from '../embeddedSupport';

server/src/embeddedSupport/vueDocumentRegionParser.ts

@@ -1,4 +1,4 @@
-import { TextDocument } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { createScanner, TokenType, Scanner } from '../modes/template/parser/htmlScanner';
 import { removeQuotes } from '../utils/strings';
 import { LanguageId } from './embeddedSupport';

server/src/modes/pug/index.ts

@@ -1,4 +1,5 @@
-import { TextDocument, Position, Range } from 'vscode-languageserver-types';
+import { Position, Range } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { LanguageMode } from '../../embeddedSupport/languageModes';
 import { prettierify } from '../../utils/prettier';
 import { VLSFormatConfig } from '../../config';

server/src/modes/style/index.ts

@@ -1,4 +1,5 @@
-import { TextDocument, Position, Range } from 'vscode-languageserver-types';
+import { Position, Range } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import {
   getCSSLanguageService,
   getSCSSLanguageService,

server/src/modes/style/sass/sassLanguageMode.ts

@@ -1,6 +1,7 @@
 import { LanguageMode } from '../../../embeddedSupport/languageModes';
 
-import { TextDocument, Range, FormattingOptions, CompletionList } from 'vscode-languageserver-types/lib/umd/main';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
+import { Range, FormattingOptions, CompletionList } from 'vscode-languageserver-types';
 
 import { TextEdit, Position } from 'vscode-css-languageservice';
 

server/src/modes/style/stylus/completion-item.ts

@@ -1,10 +1,5 @@
-import {
-  CompletionItem,
-  CompletionItemKind,
-  TextDocument,
-  Position,
-  CompletionList
-} from 'vscode-languageserver-types';
+import { CompletionItem, CompletionItemKind, Position, CompletionList } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 import {
   StylusNode,

server/src/modes/style/stylus/stylus-hover.ts

@@ -1,4 +1,5 @@
-import { TextDocument, Position, Hover, Range } from 'vscode-languageserver-types';
+import { Position, Hover, Range } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 import { buildAst, findNodeAtPosition } from './parser';
 

server/src/modes/style/stylus/symbols-finder.ts

@@ -1,4 +1,5 @@
-import { TextDocument, SymbolInformation, SymbolKind, Range, Position } from 'vscode-languageserver-types';
+import { SymbolInformation, SymbolKind, Range, Position } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 import {
   StylusNode,

server/src/modes/template/htmlMode.ts

@@ -1,7 +1,8 @@
 import * as _ from 'lodash';
 
 import { LanguageModelCache, getLanguageModelCache } from '../../embeddedSupport/languageModelCache';
-import { TextDocument, Position, Range, FormattingOptions } from 'vscode-languageserver-types';
+import { Position, Range, FormattingOptions } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { LanguageMode } from '../../embeddedSupport/languageModes';
 import { VueDocumentRegions } from '../../embeddedSupport/embeddedSupport';
 import { HTMLDocument } from './parser/htmlParser';
@@ -79,7 +80,7 @@ export class HTMLMode implements LanguageMode {
     }
     if (this.config.vetur.validation.template) {
       const embedded = this.embeddedDocuments.refreshAndGet(document);
-      diagnostics.push(...doESLintValidation(embedded, this.lintEngine));
+      diagnostics.push(...(await doESLintValidation(embedded, this.lintEngine)));
     }
 
     return diagnostics;

server/src/modes/template/index.ts

@@ -1,12 +1,5 @@
-import {
-  FormattingOptions,
-  Position,
-  Range,
-  TextDocument,
-  Hover,
-  Location,
-  CompletionItem
-} from 'vscode-languageserver-types';
+import { FormattingOptions, Position, Range, Hover, Location, CompletionItem } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { VueDocumentRegions } from '../../embeddedSupport/embeddedSupport';
 import { LanguageModelCache, getLanguageModelCache } from '../../embeddedSupport/languageModelCache';
 import { LanguageMode } from '../../embeddedSupport/languageModes';

server/src/modes/template/interpolationMode.ts

@@ -11,10 +11,10 @@ import {
   MarkupContent,
   Position,
   Range,
-  TextDocument,
   TextEdit
 } from 'vscode-languageserver-types';
 import { URI } from 'vscode-uri';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 import { VLSFullConfig } from '../../config';
 import { LanguageModelCache } from '../../embeddedSupport/languageModelCache';
 import { LanguageMode } from '../../embeddedSupport/languageModes';

server/src/modes/template/parser/htmlParser.ts

@@ -1,6 +1,6 @@
 import { TokenType, createScanner } from './htmlScanner';
 import { isVoidElement } from '../tagProviders/htmlTags';
-import { TextDocument } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 export class Node {
   public tag?: string;

server/src/modes/template/services/htmlCompletion.ts

@@ -1,5 +1,4 @@
 import {
-  TextDocument,
   Position,
   CompletionList,
   CompletionItemKind,
@@ -8,6 +7,7 @@ import {
   InsertTextFormat,
   CompletionItem
 } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { HTMLDocument } from '../parser/htmlParser';
 import { TokenType, createScanner, ScannerState } from '../parser/htmlScanner';
 import { IHTMLTagProvider } from '../tagProviders';

server/src/modes/template/services/htmlDefinition.ts

@@ -1,6 +1,7 @@
 import { HTMLDocument } from '../parser/htmlParser';
 import { TokenType, createScanner } from '../parser/htmlScanner';
-import { TextDocument, Range, Position, Location } from 'vscode-languageserver-types';
+import { Range, Position, Location } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { VueFileInfo } from '../../../services/vueInfoService';
 import { URI } from 'vscode-uri';
 import { kebabCase } from 'lodash';

server/src/modes/template/services/htmlEslintValidation.ts

@@ -1,6 +1,7 @@
-import { CLIEngine, Linter } from 'eslint';
+import { ESLint, Linter } from 'eslint';
 import { configs } from 'eslint-plugin-vue';
-import { TextDocument, Diagnostic, Range, DiagnosticSeverity } from 'vscode-languageserver-types';
+import { Diagnostic, Range, DiagnosticSeverity } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { resolve } from 'path';
 import { VueVersion } from '../../../services/typescriptService/vueVersion';
 
@@ -17,32 +18,27 @@ function toDiagnostic(error: Linter.LintMessage): Diagnostic {
   };
 }
 
-export function doESLintValidation(document: TextDocument, engine: CLIEngine): Diagnostic[] {
+export async function doESLintValidation(document: TextDocument, engine: ESLint): Promise<Diagnostic[]> {
   const rawText = document.getText();
   // skip checking on empty template
   if (rawText.replace(/\s/g, '') === '') {
     return [];
   }
   const text = rawText.replace(/ {10}/, '<template>') + '</template>';
-  const report = engine.executeOnText(text, document.uri);
+  const report = await engine.lintText(text, { filePath: document.uri });
 
-  return report.results[0] ? report.results[0].messages.map(toDiagnostic) : [];
+  return report?.[0].messages.map(toDiagnostic) ?? [];
 }
 
 export function createLintEngine(vueVersion: VueVersion) {
   const SERVER_ROOT = resolve(__dirname, '../../../../');
 
-  const basicConfig = {
-    useEslintrc: false,
-    // So ESLint can find the bundled eslint-plugin-vue
-    cwd: SERVER_ROOT,
-    ...configs.base
-  };
-
   const versionSpecificConfig = vueVersion === VueVersion.V30 ? configs['vue3-essential'] : configs.essential;
 
-  return new CLIEngine({
-    ...basicConfig,
-    ...versionSpecificConfig
+  return new ESLint({
+    useEslintrc: false,
+    cwd: SERVER_ROOT,
+    baseConfig: configs.base,
+    overrideConfig: versionSpecificConfig
   });
 }

server/src/modes/template/services/htmlFolding.ts

@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { TextDocument, FoldingRange, FoldingRangeKind } from 'vscode-languageserver-types';
+import { FoldingRange, FoldingRangeKind } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 import { TokenType, createScanner } from '../parser/htmlScanner';
 import { isVoidElement } from '../tagProviders/htmlTags';

server/src/modes/template/services/htmlFormat.ts

@@ -1,5 +1,6 @@
 import * as _ from 'lodash';
-import { TextDocument, Range, TextEdit, Position } from 'vscode-languageserver-types';
+import { Range, TextEdit, Position } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { html as htmlBeautify } from 'js-beautify';
 import { IPrettyHtml } from './prettyhtml';
 import { requireLocalPkg } from '../../../utils/prettier/requirePkg';

server/src/modes/template/services/htmlHighlighting.ts

@@ -1,6 +1,7 @@
 import { HTMLDocument } from '../parser/htmlParser';
 import { TokenType, createScanner } from '../parser/htmlScanner';
-import { TextDocument, Range, Position, DocumentHighlightKind, DocumentHighlight } from 'vscode-languageserver-types';
+import { Range, Position, DocumentHighlightKind, DocumentHighlight } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 
 export function findDocumentHighlights(
   document: TextDocument,

server/src/modes/template/services/htmlHover.ts

@@ -1,6 +1,7 @@
 import { HTMLDocument } from '../parser/htmlParser';
 import { TokenType, createScanner } from '../parser/htmlScanner';
-import { TextDocument, Range, Position, Hover } from 'vscode-languageserver-types';
+import { Range, Position, Hover } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { IHTMLTagProvider } from '../tagProviders';
 import { NULL_HOVER } from '../../nullMode';
 import { toMarkupContent } from '../../../utils/strings';

server/src/modes/template/services/htmlLinks.ts

@@ -1,5 +1,6 @@
 import { TokenType, createScanner } from '../parser/htmlScanner';
-import { TextDocument, Range, DocumentLink } from 'vscode-languageserver-types';
+import { Range, DocumentLink } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { URI } from 'vscode-uri';
 import { DocumentContext } from '../../../types';
 

server/src/modes/template/services/htmlSymbolsProvider.ts

@@ -1,4 +1,5 @@
-import { TextDocument, Location, Range, SymbolInformation, SymbolKind } from 'vscode-languageserver-types';
+import { Location, Range, SymbolInformation, SymbolKind } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { HTMLDocument, Node } from '../parser/htmlParser';
 
 export function findDocumentSymbols(document: TextDocument, htmlDocument: HTMLDocument): SymbolInformation[] {

server/src/modes/template/services/vuePropValidation.ts

@@ -1,5 +1,6 @@
 import { VueFileInfo, PropInfo } from '../../../services/vueInfoService';
-import { TextDocument, Diagnostic, DiagnosticSeverity } from 'vscode-languageserver-types';
+import { Diagnostic, DiagnosticSeverity } from 'vscode-languageserver-types';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { HTMLDocument, Node } from '../parser/htmlParser';
 import { kebabCase } from 'lodash';
 import { getSameTagInSet } from '../tagProviders/common';

server/src/modes/template/test/highlighting.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { TextDocument } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 import { parseHTMLDocument } from '../parser/htmlParser';
 import { findDocumentHighlights } from '../services/htmlHighlighting';
 
@@ -27,13 +27,7 @@ suite('HTML Highlighting', () => {
       const actualEndOffset = document.offsetAt(highlights[i].range.end);
       assert.equal(actualEndOffset, expectedMatches[i] + elementName!.length);
 
-      assert.equal(
-        document
-          .getText()
-          .substring(actualStartOffset, actualEndOffset)
-          .toLowerCase(),
-        elementName
-      );
+      assert.equal(document.getText().substring(actualStartOffset, actualEndOffset).toLowerCase(), elementName);
     }
   }
 

server/src/modes/template/test/links.test.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import { TextDocument } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 import * as url from 'url';
 
 import { findDocumentLinks } from '../services/htmlLinks';

server/src/modes/template/test/symbols.test.ts

@@ -6,7 +6,8 @@
 
 import * as assert from 'assert';
 
-import { TextDocument, SymbolInformation, SymbolKind, Location, Range } from 'vscode-languageserver-types';
+import { SymbolInformation, SymbolKind, Location, Range } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 import { parseHTMLDocument } from '../parser/htmlParser';
 import { findDocumentSymbols } from '../services/htmlSymbolsProvider';
 

server/src/modes/test-util/completion-test-util.ts

@@ -1,13 +1,13 @@
 import * as assert from 'assert';
 import {
   CompletionList,
-  TextDocument,
   CompletionItemKind,
   Position,
   CompletionItem,
   TextEdit,
   InsertReplaceEdit
 } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 
 export interface CompletionTestSetup {
   doComplete(doc: TextDocument, pos: Position): CompletionList;

server/src/modes/test-util/hover-test-util.ts

@@ -1,5 +1,6 @@
 import * as assert from 'assert';
-import { TextDocument, Position, Hover } from 'vscode-languageserver-types';
+import { Position, Hover } from 'vscode-languageserver-types';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 
 export interface HoverTestSetup {
   docUri: string;