@astrojs/language-server 0.11.0 → 0.12.0

package/dist/plugins/typescript/utils.js

@@ -1,73 +1,53 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.substituteWithWhitespace = exports.isSubPath = exports.findTsConfigPath = exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualTsFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualJsxFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.convertToLocationRange = exports.convertRange = exports.getExtensionFromScriptKind = exports.getScriptKindFromFileName = exports.mapSeverity = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = void 0;
-const ts = __importStar(require("typescript"));
-const vscode_languageserver_1 = require("vscode-languageserver");
+exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = void 0;
+const typescript_1 = __importDefault(require("typescript"));
 const path_1 = require("path");
 const utils_1 = require("../../utils");
+const vscode_languageserver_1 = require("vscode-languageserver");
 const documents_1 = require("../../core/documents");
 function scriptElementKindToCompletionItemKind(kind) {
     switch (kind) {
-        case ts.ScriptElementKind.primitiveType:
-        case ts.ScriptElementKind.keyword:
+        case typescript_1.default.ScriptElementKind.primitiveType:
+        case typescript_1.default.ScriptElementKind.keyword:
             return vscode_languageserver_1.CompletionItemKind.Keyword;
-        case ts.ScriptElementKind.constElement:
+        case typescript_1.default.ScriptElementKind.constElement:
             return vscode_languageserver_1.CompletionItemKind.Constant;
-        case ts.ScriptElementKind.letElement:
-        case ts.ScriptElementKind.variableElement:
-        case ts.ScriptElementKind.localVariableElement:
-        case ts.ScriptElementKind.alias:
+        case typescript_1.default.ScriptElementKind.letElement:
+        case typescript_1.default.ScriptElementKind.variableElement:
+        case typescript_1.default.ScriptElementKind.localVariableElement:
+        case typescript_1.default.ScriptElementKind.alias:
             return vscode_languageserver_1.CompletionItemKind.Variable;
-        case ts.ScriptElementKind.memberVariableElement:
-        case ts.ScriptElementKind.memberGetAccessorElement:
-        case ts.ScriptElementKind.memberSetAccessorElement:
+        case typescript_1.default.ScriptElementKind.memberVariableElement:
+        case typescript_1.default.ScriptElementKind.memberGetAccessorElement:
+        case typescript_1.default.ScriptElementKind.memberSetAccessorElement:
             return vscode_languageserver_1.CompletionItemKind.Field;
-        case ts.ScriptElementKind.functionElement:
+        case typescript_1.default.ScriptElementKind.functionElement:
             return vscode_languageserver_1.CompletionItemKind.Function;
-        case ts.ScriptElementKind.memberFunctionElement:
-        case ts.ScriptElementKind.constructSignatureElement:
-        case ts.ScriptElementKind.callSignatureElement:
-        case ts.ScriptElementKind.indexSignatureElement:
+        case typescript_1.default.ScriptElementKind.memberFunctionElement:
+        case typescript_1.default.ScriptElementKind.constructSignatureElement:
+        case typescript_1.default.ScriptElementKind.callSignatureElement:
+        case typescript_1.default.ScriptElementKind.indexSignatureElement:
             return vscode_languageserver_1.CompletionItemKind.Method;
-        case ts.ScriptElementKind.enumElement:
+        case typescript_1.default.ScriptElementKind.enumElement:
             return vscode_languageserver_1.CompletionItemKind.Enum;
-        case ts.ScriptElementKind.moduleElement:
-        case ts.ScriptElementKind.externalModuleName:
+        case typescript_1.default.ScriptElementKind.moduleElement:
+        case typescript_1.default.ScriptElementKind.externalModuleName:
             return vscode_languageserver_1.CompletionItemKind.Module;
-        case ts.ScriptElementKind.classElement:
-        case ts.ScriptElementKind.typeElement:
+        case typescript_1.default.ScriptElementKind.classElement:
+        case typescript_1.default.ScriptElementKind.typeElement:
             return vscode_languageserver_1.CompletionItemKind.Class;
-        case ts.ScriptElementKind.interfaceElement:
+        case typescript_1.default.ScriptElementKind.interfaceElement:
             return vscode_languageserver_1.CompletionItemKind.Interface;
-        case ts.ScriptElementKind.warning:
-        case ts.ScriptElementKind.scriptElement:
+        case typescript_1.default.ScriptElementKind.warning:
+        case typescript_1.default.ScriptElementKind.scriptElement:
             return vscode_languageserver_1.CompletionItemKind.File;
-        case ts.ScriptElementKind.directory:
+        case typescript_1.default.ScriptElementKind.directory:
             return vscode_languageserver_1.CompletionItemKind.Folder;
-        case ts.ScriptElementKind.string:
+        case typescript_1.default.ScriptElementKind.string:
             return vscode_languageserver_1.CompletionItemKind.Constant;
     }
     return vscode_languageserver_1.CompletionItemKind.Property;
@@ -76,25 +56,25 @@ exports.scriptElementKindToCompletionItemKind = scriptElementKindToCompletionIte
 function getCommitCharactersForScriptElement(kind) {
     const commitCharacters = [];
     switch (kind) {
-        case ts.ScriptElementKind.memberGetAccessorElement:
-        case ts.ScriptElementKind.memberSetAccessorElement:
-        case ts.ScriptElementKind.constructSignatureElement:
-        case ts.ScriptElementKind.callSignatureElement:
-        case ts.ScriptElementKind.indexSignatureElement:
-        case ts.ScriptElementKind.enumElement:
-        case ts.ScriptElementKind.interfaceElement:
+        case typescript_1.default.ScriptElementKind.memberGetAccessorElement:
+        case typescript_1.default.ScriptElementKind.memberSetAccessorElement:
+        case typescript_1.default.ScriptElementKind.constructSignatureElement:
+        case typescript_1.default.ScriptElementKind.callSignatureElement:
+        case typescript_1.default.ScriptElementKind.indexSignatureElement:
+        case typescript_1.default.ScriptElementKind.enumElement:
+        case typescript_1.default.ScriptElementKind.interfaceElement:
             commitCharacters.push('.');
             break;
-        case ts.ScriptElementKind.moduleElement:
-        case ts.ScriptElementKind.alias:
-        case ts.ScriptElementKind.constElement:
-        case ts.ScriptElementKind.letElement:
-        case ts.ScriptElementKind.variableElement:
-        case ts.ScriptElementKind.localVariableElement:
-        case ts.ScriptElementKind.memberVariableElement:
-        case ts.ScriptElementKind.classElement:
-        case ts.ScriptElementKind.functionElement:
-        case ts.ScriptElementKind.memberFunctionElement:
+        case typescript_1.default.ScriptElementKind.moduleElement:
+        case typescript_1.default.ScriptElementKind.alias:
+        case typescript_1.default.ScriptElementKind.constElement:
+        case typescript_1.default.ScriptElementKind.letElement:
+        case typescript_1.default.ScriptElementKind.variableElement:
+        case typescript_1.default.ScriptElementKind.localVariableElement:
+        case typescript_1.default.ScriptElementKind.memberVariableElement:
+        case typescript_1.default.ScriptElementKind.classElement:
+        case typescript_1.default.ScriptElementKind.functionElement:
+        case typescript_1.default.ScriptElementKind.memberFunctionElement:
             commitCharacters.push('.', ',');
             commitCharacters.push('(');
             break;
@@ -102,54 +82,66 @@ function getCommitCharactersForScriptElement(kind) {
     return commitCharacters.length === 0 ? undefined : commitCharacters;
 }
 exports.getCommitCharactersForScriptElement = getCommitCharactersForScriptElement;
-function mapSeverity(category) {
-    switch (category) {
-        case ts.DiagnosticCategory.Error:
-            return vscode_languageserver_1.DiagnosticSeverity.Error;
-        case ts.DiagnosticCategory.Warning:
-            return vscode_languageserver_1.DiagnosticSeverity.Warning;
-        case ts.DiagnosticCategory.Suggestion:
-            return vscode_languageserver_1.DiagnosticSeverity.Hint;
-        case ts.DiagnosticCategory.Message:
-            return vscode_languageserver_1.DiagnosticSeverity.Information;
+function getExtensionFromScriptKind(kind) {
+    switch (kind) {
+        case typescript_1.default.ScriptKind.JSX:
+            return typescript_1.default.Extension.Jsx;
+        case typescript_1.default.ScriptKind.TS:
+            return typescript_1.default.Extension.Ts;
+        case typescript_1.default.ScriptKind.TSX:
+            return typescript_1.default.Extension.Tsx;
+        case typescript_1.default.ScriptKind.JSON:
+            return typescript_1.default.Extension.Json;
+        case typescript_1.default.ScriptKind.JS:
+        default:
+            return typescript_1.default.Extension.Js;
     }
-    return vscode_languageserver_1.DiagnosticSeverity.Error;
 }
-exports.mapSeverity = mapSeverity;
+exports.getExtensionFromScriptKind = getExtensionFromScriptKind;
+function findTsConfigPath(fileName, rootUris) {
+    const searchDir = (0, path_1.dirname)(fileName);
+    const path = typescript_1.default.findConfigFile(searchDir, typescript_1.default.sys.fileExists, 'tsconfig.json') ||
+        typescript_1.default.findConfigFile(searchDir, typescript_1.default.sys.fileExists, 'jsconfig.json') ||
+        '';
+    // Don't return config files that exceed the current workspace context.
+    return !!path && rootUris.some((rootUri) => isSubPath(rootUri, path)) ? path : '';
+}
+exports.findTsConfigPath = findTsConfigPath;
+function isSubPath(uri, possibleSubPath) {
+    return (0, utils_1.pathToUrl)(possibleSubPath).startsWith(uri);
+}
+exports.isSubPath = isSubPath;
 function getScriptKindFromFileName(fileName) {
-    const ext = fileName.substr(fileName.lastIndexOf('.'));
+    const ext = fileName.substring(fileName.lastIndexOf('.'));
     switch (ext.toLowerCase()) {
-        case ts.Extension.Js:
-            return ts.ScriptKind.JS;
-        case ts.Extension.Jsx:
-            return ts.ScriptKind.JSX;
-        case ts.Extension.Ts:
-            return ts.ScriptKind.TS;
-        case ts.Extension.Tsx:
-            return ts.ScriptKind.TSX;
-        case ts.Extension.Json:
-            return ts.ScriptKind.JSON;
+        case typescript_1.default.Extension.Js:
+            return typescript_1.default.ScriptKind.JS;
+        case typescript_1.default.Extension.Jsx:
+            return typescript_1.default.ScriptKind.JSX;
+        case typescript_1.default.Extension.Ts:
+            return typescript_1.default.ScriptKind.TS;
+        case typescript_1.default.Extension.Tsx:
+            return typescript_1.default.ScriptKind.TSX;
+        case typescript_1.default.Extension.Json:
+            return typescript_1.default.ScriptKind.JSON;
         default:
-            return ts.ScriptKind.Unknown;
+            return typescript_1.default.ScriptKind.Unknown;
     }
 }
 exports.getScriptKindFromFileName = getScriptKindFromFileName;
-function getExtensionFromScriptKind(kind) {
-    switch (kind) {
-        case ts.ScriptKind.JSX:
-            return ts.Extension.Jsx;
-        case ts.ScriptKind.TS:
-            return ts.Extension.Ts;
-        case ts.ScriptKind.TSX:
-            return ts.Extension.Tsx;
-        case ts.ScriptKind.JSON:
-            return ts.Extension.Json;
-        case ts.ScriptKind.JS:
-        default:
-            return ts.Extension.Js;
+function mapSeverity(category) {
+    switch (category) {
+        case typescript_1.default.DiagnosticCategory.Error:
+            return vscode_languageserver_1.DiagnosticSeverity.Error;
+        case typescript_1.default.DiagnosticCategory.Warning:
+            return vscode_languageserver_1.DiagnosticSeverity.Warning;
+        case typescript_1.default.DiagnosticCategory.Suggestion:
+            return vscode_languageserver_1.DiagnosticSeverity.Hint;
+        case typescript_1.default.DiagnosticCategory.Message:
+            return vscode_languageserver_1.DiagnosticSeverity.Information;
     }
 }
-exports.getExtensionFromScriptKind = getExtensionFromScriptKind;
+exports.mapSeverity = mapSeverity;
 function convertRange(document, range) {
     return vscode_languageserver_1.Range.create(document.positionAt(range.start || 0), document.positionAt((range.start || 0) + (range.length || 0)));
 }
@@ -169,8 +161,13 @@ function convertToLocationRange(defDoc, textSpan) {
 exports.convertToLocationRange = convertToLocationRange;
 const VirtualExtension = {
     ts: 'ts',
-    tsx: 'tsx'
+    tsx: 'tsx',
 };
+function getFrameworkFromFilePath(filePath) {
+    filePath = ensureRealFilePath(filePath);
+    return (0, path_1.extname)(filePath).substring(1);
+}
+exports.getFrameworkFromFilePath = getFrameworkFromFilePath;
 function isVirtualFrameworkFilePath(ext, virtualExt, filePath) {
     return filePath.endsWith('.' + ext + '.' + virtualExt);
 }
@@ -191,20 +188,12 @@ function isVirtualVueFilePath(filePath) {
     return isVirtualFrameworkFilePath('vue', VirtualExtension.tsx, filePath);
 }
 exports.isVirtualVueFilePath = isVirtualVueFilePath;
-function isVirtualJsxFilePath(filePath) {
-    return isVirtualFrameworkFilePath('jsx', VirtualExtension.ts, filePath) || isVirtualFrameworkFilePath('tsx', VirtualExtension.ts, filePath);
-}
-exports.isVirtualJsxFilePath = isVirtualJsxFilePath;
 function isVirtualSvelteFilePath(filePath) {
     return isVirtualFrameworkFilePath('svelte', VirtualExtension.tsx, filePath);
 }
 exports.isVirtualSvelteFilePath = isVirtualSvelteFilePath;
-function isVirtualTsFilePath(filePath) {
-    return isVirtualFrameworkFilePath('ts', VirtualExtension.tsx, filePath);
-}
-exports.isVirtualTsFilePath = isVirtualTsFilePath;
 function isVirtualFilePath(filePath) {
-    return isVirtualAstroFilePath(filePath) || isVirtualVueFilePath(filePath) || isVirtualSvelteFilePath(filePath) || isVirtualJsxFilePath(filePath) || isVirtualTsFilePath(filePath);
+    return isVirtualAstroFilePath(filePath) || isVirtualVueFilePath(filePath) || isVirtualSvelteFilePath(filePath);
 }
 exports.isVirtualFilePath = isVirtualFilePath;
 function toVirtualAstroFilePath(filePath) {
@@ -223,7 +212,7 @@ function toVirtualFilePath(filePath) {
     if (isVirtualFilePath(filePath)) {
         return filePath;
     }
-    else if (isFrameworkFilePath(filePath) || isAstroFilePath(filePath) || filePath.endsWith('.ts')) {
+    else if (isFrameworkFilePath(filePath) || isAstroFilePath(filePath)) {
         return `${filePath}.tsx`;
     }
     else {
@@ -249,45 +238,3 @@ function ensureRealFilePath(filePath) {
     }
 }
 exports.ensureRealFilePath = ensureRealFilePath;
-function findTsConfigPath(fileName, rootUris) {
-    const searchDir = (0, path_1.dirname)(fileName);
-    const path = ts.findConfigFile(searchDir, ts.sys.fileExists, 'tsconfig.json') || ts.findConfigFile(searchDir, ts.sys.fileExists, 'jsconfig.json') || '';
-    // Don't return config files that exceed the current workspace context.
-    return !!path && rootUris.some((rootUri) => isSubPath(rootUri, path)) ? path : '';
-}
-exports.findTsConfigPath = findTsConfigPath;
-/**  */
-function isSubPath(uri, possibleSubPath) {
-    return (0, utils_1.pathToUrl)(possibleSubPath).startsWith(uri);
-}
-exports.isSubPath = isSubPath;
-/** Substitutes */
-function substituteWithWhitespace(result, start, end, oldContent, before, after) {
-    let accumulatedWS = 0;
-    result += before;
-    for (let i = start + before.length; i < end; i++) {
-        let ch = oldContent[i];
-        if (ch === '\n' || ch === '\r') {
-            // only write new lines, skip the whitespace
-            accumulatedWS = 0;
-            result += ch;
-        }
-        else {
-            accumulatedWS++;
-        }
-    }
-    result = append(result, ' ', accumulatedWS - after.length);
-    result += after;
-    return result;
-}
-exports.substituteWithWhitespace = substituteWithWhitespace;
-function append(result, str, n) {
-    while (n > 0) {
-        if (n & 1) {
-            result += str;
-        }
-        n >>= 1;
-        str += str;
-    }
-    return result;
-}

package/dist/server.d.ts

@@ -1,4 +1,2 @@
-/**
- * Starts `astro-languageservice`
- */
-export declare function startServer(): void;
+import * as vscode from 'vscode-languageserver';
+export declare function startLanguageServer(connection: vscode.Connection): void;

package/dist/server.js

@@ -1,42 +1,67 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startServer = void 0;
-const vscode_languageserver_1 = require("vscode-languageserver");
-const documents_1 = require("./core/documents");
-const config_1 = require("./core/config");
-const plugins_1 = require("./plugins");
+exports.startLanguageServer = void 0;
+const vscode = __importStar(require("vscode-languageserver"));
+const ConfigManager_1 = require("./core/config/ConfigManager");
+const DocumentManager_1 = require("./core/documents/DocumentManager");
 const DiagnosticsManager_1 = require("./core/DiagnosticsManager");
+const AstroPlugin_1 = require("./plugins/astro/AstroPlugin");
+const CSSPlugin_1 = require("./plugins/css/CSSPlugin");
+const HTMLPlugin_1 = require("./plugins/html/HTMLPlugin");
+const PluginHost_1 = require("./plugins/PluginHost");
+const TypeScriptPlugin_1 = require("./plugins/typescript/TypeScriptPlugin");
 const utils_1 = require("./utils");
-const TagCloseRequest = new vscode_languageserver_1.RequestType('html/tag');
-/**
- * Starts `astro-languageservice`
- */
-function startServer() {
-    let connection = (0, vscode_languageserver_1.createConnection)(vscode_languageserver_1.ProposedFeatures.all);
-    const docManager = documents_1.DocumentManager.newInstance();
-    const configManager = new config_1.ConfigManager();
-    const pluginHost = new plugins_1.PluginHost(docManager);
-    connection.onInitialize((evt) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-        const workspaceUris = (_b = (_a = evt.workspaceFolders) === null || _a === void 0 ? void 0 : _a.map((folder) => folder.uri.toString())) !== null && _b !== void 0 ? _b : [(_c = evt.rootUri) !== null && _c !== void 0 ? _c : ''];
+const TagCloseRequest = new vscode.RequestType('html/tag');
+// Start the language server
+function startLanguageServer(connection) {
+    // Create our managers
+    const configManager = new ConfigManager_1.ConfigManager();
+    const documentManager = new DocumentManager_1.DocumentManager();
+    const pluginHost = new PluginHost_1.PluginHost(documentManager);
+    connection.onInitialize((params) => {
+        var _a, _b, _c, _d, _e, _f;
+        const workspaceUris = (_b = (_a = params.workspaceFolders) === null || _a === void 0 ? void 0 : _a.map((folder) => folder.uri.toString())) !== null && _b !== void 0 ? _b : [(_c = params.rootUri) !== null && _c !== void 0 ? _c : ''];
         pluginHost.initialize({
-            filterIncompleteCompletions: !((_d = evt.initializationOptions) === null || _d === void 0 ? void 0 : _d.dontFilterIncompleteCompletions),
-            definitionLinkSupport: !!((_f = (_e = evt.capabilities.textDocument) === null || _e === void 0 ? void 0 : _e.definition) === null || _f === void 0 ? void 0 : _f.linkSupport),
+            filterIncompleteCompletions: !((_d = params.initializationOptions) === null || _d === void 0 ? void 0 : _d.dontFilterIncompleteCompletions),
+            definitionLinkSupport: !!((_f = (_e = params.capabilities.textDocument) === null || _e === void 0 ? void 0 : _e.definition) === null || _f === void 0 ? void 0 : _f.linkSupport),
         });
-        pluginHost.register(new plugins_1.HTMLPlugin(docManager, configManager));
-        pluginHost.register(new plugins_1.CSSPlugin(docManager, configManager));
-        pluginHost.register(new plugins_1.TypeScriptPlugin(docManager, configManager, workspaceUris));
-        pluginHost.register(new plugins_1.AstroPlugin(docManager, configManager, workspaceUris));
-        configManager.update(((_j = (_h = (_g = evt.initializationOptions) === null || _g === void 0 ? void 0 : _g.configuration) === null || _h === void 0 ? void 0 : _h.astro) === null || _j === void 0 ? void 0 : _j.plugin) ||
-            ((_k = evt.initializationOptions) === null || _k === void 0 ? void 0 : _k.config) ||
-            {});
-        configManager.updateTsJsUserPreferences(((_l = evt.initializationOptions) === null || _l === void 0 ? void 0 : _l.configuration) ||
-            ((_m = evt.initializationOptions) === null || _m === void 0 ? void 0 : _m.typescriptConfig) ||
-            {});
-        configManager.updateEmmetConfig(((_p = (_o = evt.initializationOptions) === null || _o === void 0 ? void 0 : _o.configuration) === null || _p === void 0 ? void 0 : _p.emmet) || ((_q = evt.initializationOptions) === null || _q === void 0 ? void 0 : _q.emmetConfig) || {});
+        // Register plugins
+        pluginHost.registerPlugin(new HTMLPlugin_1.HTMLPlugin(configManager));
+        pluginHost.registerPlugin(new CSSPlugin_1.CSSPlugin(configManager));
+        // We don't currently support running the TypeScript and Astro plugin in the browser
+        if (params.initializationOptions.environment !== 'browser') {
+            pluginHost.registerPlugin(new AstroPlugin_1.AstroPlugin(documentManager, configManager, workspaceUris));
+            pluginHost.registerPlugin(new TypeScriptPlugin_1.TypeScriptPlugin(documentManager, configManager, workspaceUris));
+        }
+        // Update language-server config with what the user supplied to us at launch
+        configManager.updateConfig(params.initializationOptions.configuration.astro);
+        configManager.updateEmmetConfig(params.initializationOptions.configuration.emmet);
         return {
             capabilities: {
-                textDocumentSync: vscode_languageserver_1.TextDocumentSyncKind.Incremental,
+                textDocumentSync: vscode.TextDocumentSyncKind.Incremental,
                 foldingRangeProvider: true,
                 definitionProvider: true,
                 renameProvider: true,
@@ -77,17 +102,22 @@ function startServer() {
             },
         };
     });
+    // On update of the user configuration of the language-server
+    connection.onDidChangeConfiguration(({ settings }) => {
+        configManager.updateConfig(settings.astro);
+        configManager.updateEmmetConfig(settings.emmet);
+    });
     // Documents
-    connection.onDidOpenTextDocument((evt) => {
-        docManager.openDocument(Object.assign({ overrideText: true }, evt.textDocument));
-        docManager.markAsOpenedInClient(evt.textDocument.uri);
+    connection.onDidOpenTextDocument((params) => {
+        documentManager.openDocument(params.textDocument);
+        documentManager.markAsOpenedInClient(params.textDocument.uri);
     });
-    connection.onDidCloseTextDocument((evt) => docManager.closeDocument(evt.textDocument.uri));
-    const diagnosticsManager = new DiagnosticsManager_1.DiagnosticsManager(connection.sendDiagnostics, docManager, pluginHost.getDiagnostics.bind(pluginHost));
-    const updateAllDiagnostics = (0, utils_1.debounceThrottle)(() => diagnosticsManager.updateAll(), 1000);
-    connection.onDidChangeTextDocument((evt) => {
-        docManager.updateDocument(evt.textDocument.uri, evt.contentChanges);
+    connection.onDidCloseTextDocument((params) => documentManager.closeDocument(params.textDocument.uri));
+    connection.onDidChangeTextDocument((params) => {
+        documentManager.updateDocument(params.textDocument, params.contentChanges);
     });
+    const diagnosticsManager = new DiagnosticsManager_1.DiagnosticsManager(connection.sendDiagnostics, documentManager, pluginHost.getDiagnostics.bind(pluginHost));
+    const updateAllDiagnostics = (0, utils_1.debounceThrottle)(() => diagnosticsManager.updateAll(), 1000);
     connection.onDidChangeWatchedFiles((evt) => {
         const params = evt.changes
             .map((change) => ({
@@ -98,15 +128,10 @@ function startServer() {
         pluginHost.onWatchFileChanges(params);
         updateAllDiagnostics();
     });
-    //connection.onDidChangeTextDocument(updateAllDiagnostics);
-    // Config
-    connection.onDidChangeConfiguration(({ settings }) => {
-        var _a;
-        configManager.update((_a = settings.astro) === null || _a === void 0 ? void 0 : _a.plugin);
-        configManager.updateEmmetConfig(settings.emmet);
-        configManager.updateTsJsUserPreferences(settings);
-    });
     // Features
+    connection.onHover((params) => pluginHost.doHover(params.textDocument, params.position));
+    connection.onDefinition((evt) => pluginHost.getDefinitions(evt.textDocument, evt.position));
+    connection.onFoldingRanges((evt) => pluginHost.getFoldingRanges(evt.textDocument));
     connection.onCompletion(async (evt) => {
         const promise = pluginHost.getCompletions(evt.textDocument, evt.position, evt.context);
         return promise;
@@ -118,14 +143,23 @@ function startServer() {
         }
         return pluginHost.resolveCompletion(data, completionItem);
     });
-    connection.onHover((evt) => pluginHost.doHover(evt.textDocument, evt.position));
-    connection.onDefinition((evt) => pluginHost.getDefinitions(evt.textDocument, evt.position));
-    connection.onFoldingRanges((evt) => pluginHost.getFoldingRanges(evt.textDocument));
     connection.onRequest(TagCloseRequest, (evt) => pluginHost.doTagComplete(evt.textDocument, evt.position));
     connection.onSignatureHelp((evt, cancellationToken) => pluginHost.getSignatureHelp(evt.textDocument, evt.position, evt.context, cancellationToken));
-    connection.onRenameRequest(evt => pluginHost.rename(evt.textDocument, evt.position, evt.newName));
-    docManager.on('documentChange', (0, utils_1.debounceThrottle)(async (document) => diagnosticsManager.update(document), 1000));
-    docManager.on('documentClose', (document) => diagnosticsManager.removeDiagnostics(document));
+    connection.onRenameRequest((evt) => pluginHost.rename(evt.textDocument, evt.position, evt.newName));
+    connection.onDidSaveTextDocument(updateAllDiagnostics);
+    connection.onNotification('$/onDidChangeNonAstroFile', async (e) => {
+        const path = (0, utils_1.urlToPath)(e.uri);
+        if (path) {
+            pluginHost.updateNonAstroFile(path, e.changes);
+        }
+        updateAllDiagnostics();
+    });
+    documentManager.on('documentChange', (0, utils_1.debounceThrottle)(async (document) => diagnosticsManager.update(document), 1000));
+    documentManager.on('documentClose', (document) => diagnosticsManager.removeDiagnostics(document));
+    // Taking off 🚀
+    connection.onInitialized(() => {
+        connection.console.log('Successfully initialized! 🚀');
+    });
     connection.listen();
 }
-exports.startServer = startServer;
+exports.startLanguageServer = startLanguageServer;

package/dist/utils.d.ts

@@ -2,10 +2,20 @@ import { Position, Range } from 'vscode-languageserver';
 import { Node } from 'vscode-html-languageservice';
 /** Normalizes a document URI */
 export declare function normalizeUri(uri: string): string;
+/**
+ * Some paths (on windows) start with a upper case driver letter, some don't.
+ * This is normalized here.
+ */
+export declare function normalizePath(path: string): string;
 /** Turns a URL into a normalized FS Path */
 export declare function urlToPath(stringUrl: string): string | null;
 /** Converts a path to a URL */
 export declare function pathToUrl(path: string): string;
+/**
+ * Given a path like foo/bar or foo/bar.astro , returns its last path
+ * (bar or bar.astro in this example).
+ */
+export declare function getLastPartOfPath(path: string): string;
 /**
  *
  * The language service is case insensitive, and would provide
@@ -25,9 +35,7 @@ export declare function flatten<T>(arr: T[][]): T[];
 /** Clamps a number between min and max */
 export declare function clamp(num: number, min: number, max: number): number;
 export declare function isNotNullOrUndefined<T>(val: T | undefined | null): val is T;
-/** Checks if a position is inside range */
-export declare function isInRange(positionToTest: Position, range: Range): boolean;
-/**  */
+export declare function isInRange(range: Range, positionToTest: Position): boolean;
 export declare function isBeforeOrEqualToPosition(position: Position, positionToTest: Position): boolean;
 /**
  * Debounces a function but cancels previous invocation only if
@@ -35,15 +43,15 @@ export declare function isBeforeOrEqualToPosition(position: Position, positionTo
  *
  * @param fn The function with it's argument
  * @param determineIfSame The function which determines if the previous invocation should be canceld or not
- * @param miliseconds Number of miliseconds to debounce
+ * @param milliseconds Number of miliseconds to debounce
  */
-export declare function debounceSameArg<T>(fn: (arg: T) => void, shouldCancelPrevious: (newArg: T, prevArg?: T) => boolean, miliseconds: number): (arg: T) => void;
+export declare function debounceSameArg<T>(fn: (arg: T) => void, shouldCancelPrevious: (newArg: T, prevArg?: T) => boolean, milliseconds: number): (arg: T) => void;
 /**
- * Debounces a function but also waits at minimum the specified number of miliseconds until
+ * Debounces a function but also waits at minimum the specified number of milliseconds until
  * the next invocation. This avoids needless calls when a synchronous call (like diagnostics)
  * took too long and the whole timeout of the next call was eaten up already.
  *
  * @param fn The function with it's argument
- * @param miliseconds Number of miliseconds to debounce/throttle
+ * @param milliseconds Number of milliseconds to debounce/throttle
  */
-export declare function debounceThrottle<T extends (...args: any) => void>(fn: T, miliseconds: number): T;
+export declare function debounceThrottle<T extends (...args: any) => void>(fn: T, milliseconds: number): T;