Merge pull request #801 from vuejs/DocumentService

[WIP] Initial cut for document manager. #800

server/package.json

@@ -32,7 +32,7 @@
     "prettier-eslint": "^8.8.1",
     "stylus": "^0.54.5",
     "stylus-supremacy": "^2.10.0",
-    "typescript": "^2.8.1",
+    "typescript": "^2.8.3",
     "vscode-css-languageservice": "^3.0.3",
     "vscode-emmet-helper": "^1.1.19",
     "vscode-languageserver": "^3.5.0",

server/src/modes/languageModes.ts

@@ -18,16 +18,15 @@ import {
 import {
   Color, ColorInformation, ColorPresentation
 } from 'vscode-languageserver-protocol/lib/protocol.colorProvider.proposed';
-import { DocumentContext } from '../service';
 
 import { getLanguageModelCache, LanguageModelCache } from './languageModelCache';
 import { getDocumentRegions, VueDocumentRegions } from './embeddedSupport';
 import { getVueMode } from './vue';
 import { getCSSMode, getSCSSMode, getLESSMode, getPostCSSMode } from './style';
 import { getJavascriptMode } from './script/javascript';
 import { getVueHTMLMode } from './template';
-
 import { getStylusMode } from './style/stylus';
+import { DocumentContext } from '../types';
 
 export interface LanguageMode {
   getId(): string;

server/src/modes/nullMode.ts

@@ -12,8 +12,7 @@ export const NULL_SIGNATURE = {
 
 export const NULL_COMPLETION = {
   isIncomplete: false,
-  items: [],
-  label: ''
+  items: []
 };
 
 export const nullMode: LanguageMode = {

server/src/modes/script/javascript.ts

@@ -33,7 +33,7 @@ import Uri from 'vscode-uri';
 import * as ts from 'typescript';
 import * as _ from 'lodash';
 
-import { nullMode, NULL_SIGNATURE, NULL_COMPLETION } from '../nullMode';
+import { nullMode, NULL_SIGNATURE } from '../nullMode';
 
 // Todo: After upgrading to LS server 4.0, use CompletionContext for filtering trigger chars
 // https://microsoft.github.io/language-server-protocol/specification#completion-request-leftwards_arrow_with_hook
@@ -48,7 +48,10 @@ export function getJavascriptMode(
   workspacePath: string | null | undefined
 ): ScriptMode {
   if (!workspacePath) {
-    return { ...nullMode, findComponents: () => [] };
+    return {
+      ...nullMode,
+      findComponents: () => []
+    };
   }
   const jsDocuments = getLanguageModelCache(10, 60, document => {
     const vueDocument = documentRegions.get(document);
@@ -142,7 +145,7 @@ export function getJavascriptMode(
     doResolve(doc: TextDocument, item: CompletionItem): CompletionItem {
       const { service } = updateCurrentTextDocument(doc);
       if (!languageServiceIncludesFile(service, doc.uri)) {
-        return NULL_COMPLETION;
+        return item;
       }
 
       const fileFsPath = getFileFsPath(doc.uri);

server/src/modes/script/serviceHost.ts

@@ -261,4 +261,4 @@ function getParsedConfig(workspacePath: string) {
     /*resolutionStack*/ undefined,
     [{ extension: 'vue', isMixedContent: true }]
   );
-}
+}

server/src/modes/template/index.ts

@@ -1,9 +1,9 @@
+import * as _ from 'lodash';
+
 import { LanguageModelCache, getLanguageModelCache } from '../languageModelCache';
-import { DocumentContext } from '../../service';
 import { TextDocument, Position, Range, FormattingOptions } from 'vscode-languageserver-types';
 import { LanguageMode } from '../languageModes';
 import { VueDocumentRegions } from '../embeddedSupport';
-
 import { HTMLDocument } from './parser/htmlParser';
 import { doComplete } from './services/htmlCompletion';
 import { doHover } from './services/htmlHover';
@@ -17,8 +17,7 @@ import { findDefinition } from './services/htmlDefinition';
 import { getTagProviderSettings } from './tagProviders';
 import { ScriptMode } from '../script/javascript';
 import { getComponentTags, getEnabledTagProviders } from './tagProviders';
-
-import * as _ from 'lodash';
+import { DocumentContext } from '../../types';
 
 type DocumentRegionCache = LanguageModelCache<VueDocumentRegions>;
 

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

@@ -1,8 +1,7 @@
 import { TokenType, createScanner } from '../parser/htmlScanner';
 import { TextDocument, Range, DocumentLink } from 'vscode-languageserver-types';
 import Uri from 'vscode-uri';
-
-import { DocumentContext } from '../../../service';
+import { DocumentContext } from '../../../types';
 
 function stripQuotes(url: string): string {
   return url.replace(/^'([^']*)'$/, (substr, match1) => match1).replace(/^"([^"]*)"$/, (substr, match1) => match1);

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

@@ -8,8 +8,8 @@ import * as assert from 'assert';
 import { TextDocument } from 'vscode-languageserver-types';
 import * as url from 'url';
 
-import { DocumentContext } from '../../../service';
 import { findDocumentLinks } from '../services/htmlLinks';
+import { DocumentContext } from '../../../types';
 
 suite('HTML Link Detection', () => {
   function getDocumentContext(documentUrl: string): DocumentContext {

server/src/services/document.ts

@@ -0,0 +1,32 @@
+import { IConnection, TextDocuments } from 'vscode-languageserver';
+
+/**
+ * Service responsible for managing documents being syned through LSP
+ * Todo - Switch to incremental sync
+ */
+export class DocumentService {
+  private documents: TextDocuments;
+
+  constructor() {
+    this.documents = new TextDocuments();
+  }
+
+  listen(conn: IConnection) {
+    this.documents.listen(conn);
+  }
+
+  getDocument(uri: string) {
+    return this.documents.get(uri);
+  }
+
+  getAllDocuments() {
+    return this.documents.all();
+  }
+
+  get onDidChangeContent() {
+    return this.documents.onDidChangeContent;
+  }
+  get onDidClose() {
+    return this.documents.onDidClose;
+  }
+}