Merge branch 'master' of https://github.com/sveltejs/language-tools into html-auto-close

Author: jasonlyu123

README.md

@@ -15,6 +15,9 @@
 
 ## What is Svelte Language Tools?
 
+Svelte Language Tools contains a library implementing the Language Server Protocol (LSP). LSP powers the [VSCode extension](https://marketplace.visualstudio.com/items?itemName=svelte.svelte-vscode), which is also hosted in this repository. Additionally, LSP is capable of powering plugins for [numerous other IDEs](https://microsoft.github.io/language-server-protocol/implementors/tools/
+).
+
 A `.svelte` file would look something like this:
 
 ```html
@@ -86,14 +89,13 @@ There are two ways to work on this project: either by working against an existin
 
 ## Running the Dev Language Server Against Your App
 
-To run the developer version of both the language server and the vscode extension:
+To run the developer version of both the language server and the VSCode extension:
 
-- open the root of this repo in VS Code
+- open the root of this repo in VSCode
 - Go to the debugging panel
 - Make sure "Run VSCode Extension" is selected, and hit run
 
-This launches a new vscode window and a watcher for your changes. 
-In this dev window you can choose an existing Svelte project to work against, when you make changes to the extension or language server you can use the command "Reload Window" in the VS Code command palette to see you changes.
+This launches a new VSCode window and a watcher for your changes. In this dev window you can choose an existing Svelte project to work against. If you don't use pure Javascript and CSS, but languages like Typescript or SCSS, your project will need a [Svelte preprocessor setup](packages/svelte-vscode#using-with-preprocessors). When you make changes to the extension or language server you can use the command "Reload Window" in the VSCode command palette to see your changes.
 
 ### Running Tests
 

docs/deployment.md

@@ -0,0 +1,9 @@
+### VS Code deployments
+
+The [publisher is Svelte](https://marketplace.visualstudio.com/manage/publishers/svelte)
+
+- Extension builds with the account signed up via GitHub from orta
+
+### npm deployments
+
+- Deployments come from a bot: `svelte-language-tools-deploy`

packages/language-server/package.json

@@ -50,8 +50,8 @@
         "estree-walker": "^2.0.1",
         "lodash": "^4.17.10",
         "magic-string": "^0.25.3",
-        "prettier": "1.19.1",
-        "prettier-plugin-svelte": "0.7.0",
+        "prettier": "2.0.5",
+        "prettier-plugin-svelte": "1.1.0",
         "source-map": "^0.7.3",
         "svelte": "3.19.2",
         "typescript": "*",

packages/language-server/src/lib/documents/Document.ts

@@ -118,7 +118,7 @@ export abstract class Document implements TextDocument {
         return this.getText().split(/\r?\n/).length;
     }
 
-    languageId = '';
+    abstract languageId: string;
 }
 
 /**

packages/language-server/src/lib/documents/ManagedDocument.ts

@@ -5,6 +5,9 @@ import { WritableDocument } from './Document';
  * Represents a text document that contains a svelte component.
  */
 export class ManagedDocument extends WritableDocument {
+
+    public languageId = 'svelte';
+
     constructor(public url: string, public content: string) {
         super();
     }

packages/language-server/src/lib/documents/TextDocument.ts

@@ -2,6 +2,9 @@ import { urlToPath } from '../../utils';
 import { WritableDocument } from './Document';
 
 export class TextDocument extends WritableDocument {
+
+    public languageId = 'svelte';
+
     constructor(public url: string, public content: string) {
         super();
     }

packages/language-server/src/lib/documents/utils.ts

@@ -24,7 +24,7 @@ function parseAttributes(str: string): Record<string, string> {
  * @param tag the tag to extract
  */
 export function extractTag(source: string, tag: 'script' | 'style') {
-    const exp = new RegExp(`(<!--.*-->)|(<${tag}([\\S\\s]*?)>)([\\S\\s]*?)<\\/${tag}>`, 'igs');
+    const exp = new RegExp(`(<!--.*-->)|(<${tag}(\\s[\\S\\s]*?)?>)([\\S\\s]*?)<\\/${tag}>`, 'igs');
     let match = exp.exec(source);
 
     while (match && match[0].startsWith('<!--')) {
@@ -35,7 +35,7 @@ export function extractTag(source: string, tag: 'script' | 'style') {
         return null;
     }
 
-    const attributes = parseAttributes(match[3]);
+    const attributes = parseAttributes(match[3] || '');
     const content = match[4];
     const start = match.index + match[2].length;
     const end = start + content.length;

packages/language-server/src/plugins/PluginHost.ts

@@ -15,10 +15,11 @@ import {
     TextDocumentIdentifier,
     TextEdit,
     FileChangeType,
+    CompletionItem,
 } from 'vscode-languageserver';
 import { LSConfig, LSConfigManager } from '../ls-config';
 import { DocumentManager } from '../lib/documents';
-import { LSProvider, Plugin, OnWatchFileChanges } from './interfaces';
+import { LSProvider, Plugin, OnWatchFileChanges, AppCompletionItem } from './interfaces';
 
 enum ExecuteMode {
     None,
@@ -88,6 +89,26 @@ export class PluginHost implements LSProvider, OnWatchFileChanges {
         );
     }
 
+    async resolveCompletion(
+        textDocument: TextDocumentIdentifier,
+        completionItem: AppCompletionItem
+    ): Promise<CompletionItem> {
+        const document = this.getDocument(textDocument.uri);
+
+        if (!document) {
+            throw new Error('Cannot call methods on an unopened document');
+        }
+
+        const result = await this.execute<CompletionItem>(
+            'resolveCompletion',
+            [document, completionItem],
+            ExecuteMode.FirstNonNull
+        );
+
+        return result ?? completionItem;
+    }
+
+
     async formatDocument(textDocument: TextDocumentIdentifier): Promise<TextEdit[]> {
         const document = this.getDocument(textDocument.uri);
         if (!document) {

packages/language-server/src/plugins/css/CSSDocument.ts

@@ -66,6 +66,7 @@ export class CSSFragment {
 export class CSSDocument extends Document implements Fragment {
     private cssFragment: CSSFragment;
     public stylesheet: Stylesheet;
+    public languageId = 'css';
 
     constructor(private parent: Document) {
         super();

packages/language-server/src/plugins/css/features/svelte-selectors.ts

@@ -0,0 +1,17 @@
+import { IPseudoClassData } from 'vscode-css-languageservice';
+
+export const pesudoClass: IPseudoClassData[] = [
+    {
+        name: ':global()',
+        description:
+`[svelte] :global modifier
+
+Applying styles to a selector globally`,
+        references: [
+            {
+                name: 'Svelte.dev Reference',
+                url: 'https://svelte.dev/docs#style'
+            }
+        ]
+    },
+];