@zzzen/pyright-internal 1.2.0-dev.20230212 → 1.2.0-dev.20230219

package/dist/common/textEditUtils.js

@@ -26,11 +26,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TextEditTracker = exports.convertEditActionsToWorkspaceEdit = exports.convertEditActionsToTextEdits = void 0;
+exports.TextEditTracker = exports.applyTextEditActions = exports.convertEditActionsToWorkspaceEdit = exports.convertEditActionsToTextEdits = void 0;
 const analyzerNodeInfo_1 = require("../analyzer/analyzerNodeInfo");
 const importStatementUtils_1 = require("../analyzer/importStatementUtils");
 const ParseTreeUtils = __importStar(require("../analyzer/parseTreeUtils"));
 const debug = __importStar(require("../common/debug"));
+const editAction_1 = require("../common/editAction");
 const collectionUtils_1 = require("./collectionUtils");
 const core_1 = require("./core");
 const positionUtils_1 = require("./positionUtils");
@@ -54,50 +55,116 @@ function convertEditActionsToWorkspaceEdit(uri, editActions) {
     };
 }
 exports.convertEditActionsToWorkspaceEdit = convertEditActionsToWorkspaceEdit;
+function applyTextEditActions(text, edits, lines) {
+    const editsWithOffset = edits
+        .map((e) => {
+        var _a;
+        return ({
+            range: (_a = (0, positionUtils_1.convertRangeToTextRange)(e.range, lines)) !== null && _a !== void 0 ? _a : { start: text.length, length: 0 },
+            text: e.replacementText,
+        });
+    })
+        .sort((e1, e2) => {
+        const result = e2.range.start - e1.range.start;
+        if (result !== 0) {
+            return result;
+        }
+        return textRange_1.TextRange.getEnd(e2.range) - textRange_1.TextRange.getEnd(e1.range);
+    });
+    // Apply change in reverse order.
+    let current = text;
+    for (const change of editsWithOffset) {
+        current = current.substr(0, change.range.start) + change.text + current.substr(textRange_1.TextRange.getEnd(change.range));
+    }
+    return current;
+}
+exports.applyTextEditActions = applyTextEditActions;
 class TextEditTracker {
-    constructor() {
-        this._nodesRemoved = [];
+    constructor(_mergeOnlyDuplications = true) {
+        this._mergeOnlyDuplications = _mergeOnlyDuplications;
+        this._nodesRemoved = new Map();
         this._results = new Map();
+        this._pendingNodeToRemove = [];
+        // Empty
     }
     addEdits(...edits) {
         edits.forEach((e) => this.addEdit(e.filePath, e.range, e.replacementText));
     }
     addEdit(filePath, range, replacementText) {
         const edits = (0, collectionUtils_1.getOrAdd)(this._results, filePath, () => []);
-        if (replacementText === '') {
-            // If it is a deletion, merge with overlapping deletion edit if there is any.
-            const deletions = this.getDeletionsForSpan(edits, range);
-            if (deletions.length > 0) {
-                // Delete the existing ones.
-                this.removeEdits(edits, deletions);
-                // Extend range with deleted ones.
-                (0, textRange_1.extendRange)(range, deletions.map((d) => d.range));
-            }
+        // If there is any overlapping edit, see whether we can merge edits.
+        // We can merge edits, if one of them is 'deletion' or 2 edits has the same
+        // replacement text with containing range.
+        const overlappingEdits = this._getEditsToMerge(edits, range, replacementText);
+        if (overlappingEdits.length > 0) {
+            // Merge the given edit with the existing edits by
+            // first deleting existing edits and expanding the current edit's range
+            // to cover all existing edits.
+            this._removeEdits(edits, overlappingEdits);
+            (0, textRange_1.extendRange)(range, overlappingEdits.map((d) => d.range));
         }
-        // Don't put duplicated edit. It can happen if code has duplicated module import.
-        // ex) from a import b, b, c
-        // If we need to introduce new "from import" statement for "b", we will add new statement twice.
-        if (edits.some((e) => (0, textRange_1.rangesAreEqual)(e.range, range) && e.replacementText === replacementText)) {
+        edits.push({ filePath, range, replacementText });
+    }
+    addEditWithTextRange(parseResults, range, replacementText) {
+        const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree).filePath;
+        const existing = parseResults.text.substr(range.start, range.length);
+        if (existing === replacementText) {
+            // No change. Return as it is.
             return;
         }
-        edits.push({ filePath, range, replacementText });
+        this.addEdit(filePath, (0, positionUtils_1.convertTextRangeToRange)(range, parseResults.tokenizerOutput.lines), replacementText);
     }
-    getDeletionsForSpan(filePathOrEdit, range) {
-        var _a;
-        if ((0, core_1.isString)(filePathOrEdit)) {
-            filePathOrEdit = (_a = this._results.get(filePathOrEdit)) !== null && _a !== void 0 ? _a : [];
+    deleteImportName(parseResults, importToDelete) {
+        // TODO: remove all these manual text handling and merge it to _processNodeRemoved that is
+        //       used by remove unused imports.
+        const imports = importToDelete.nodeType === 21 /* ImportAs */
+            ? importToDelete.parent.list
+            : importToDelete.parent.imports;
+        const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree).filePath;
+        const ranges = (0, importStatementUtils_1.getTextRangeForImportNameDeletion)(imports, imports.findIndex((v) => v === importToDelete));
+        ranges.forEach((r) => this.addEditWithTextRange(parseResults, r, ''));
+        this._markNodeRemoved(importToDelete, parseResults);
+        // Check whether we have deleted all trailing import names.
+        // If either no trailing import is deleted or handled properly
+        // then, there is nothing to do. otherwise, either delete the whole statement
+        // or remove trailing comma.
+        // ex) from x import [y], z or from x import y[, z]
+        let lastImportIndexNotDeleted = 0;
+        for (lastImportIndexNotDeleted = imports.length - 1; lastImportIndexNotDeleted >= 0; lastImportIndexNotDeleted--) {
+            if (!this._nodesRemoved.has(imports[lastImportIndexNotDeleted])) {
+                break;
+            }
+        }
+        if (lastImportIndexNotDeleted === -1) {
+            // Whole statement is deleted. Remove the statement itself.
+            // ex) [from x import a, b, c] or [import a]
+            const importStatement = importToDelete.parent;
+            if (importStatement) {
+                this.addEdit(filePath, ParseTreeUtils.getFullStatementRange(importStatement, parseResults), '');
+            }
+        }
+        else if (lastImportIndexNotDeleted >= 0 && lastImportIndexNotDeleted < imports.length - 2) {
+            // We need to delete trailing comma
+            // ex) from x import a, [b, c]
+            const start = textRange_1.TextRange.getEnd(imports[lastImportIndexNotDeleted]);
+            const length = textRange_1.TextRange.getEnd(imports[lastImportIndexNotDeleted + 1]) - start;
+            this.addEditWithTextRange(parseResults, { start, length }, '');
         }
-        return filePathOrEdit.filter((e) => e.replacementText === '' && (0, textRange_1.doRangesIntersect)(e.range, range));
     }
-    removeEdits(filePathOrEdit, edits) {
-        var _a;
-        if ((0, core_1.isString)(filePathOrEdit)) {
-            filePathOrEdit = (_a = this._results.get(filePathOrEdit)) !== null && _a !== void 0 ? _a : [];
+    addOrUpdateImport(parseResults, importStatements, moduleNameInfo, importGroup, importNameInfo, updateOptions) {
+        // TODO: remove all these manual text handling and merge it to _processNodeRemoved that is
+        //       used by remove unused imports.
+        if (importNameInfo &&
+            this._tryUpdateImport(parseResults, importStatements, moduleNameInfo, importNameInfo, updateOptions)) {
+            return;
         }
-        (0, collectionUtils_1.removeArrayElements)(filePathOrEdit, (f) => edits.findIndex((e) => e === f) >= 0);
+        this._addImport(parseResults, importStatements, moduleNameInfo, importGroup, importNameInfo);
     }
     removeNodes(...nodes) {
-        this._nodesRemoved.push(...nodes);
+        this._pendingNodeToRemove.push(...nodes);
+    }
+    isNodeRemoved(node) {
+        return this._nodesRemoved.has(node);
     }
     getEdits(token) {
         this._processNodeRemoved(token);
@@ -105,39 +172,131 @@ class TextEditTracker {
         this._results.forEach((v) => (0, collectionUtils_1.appendArray)(edits, v));
         return edits;
     }
+    _addImport(parseResults, importStatements, moduleNameInfo, importGroup, importNameInfo) {
+        const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree).filePath;
+        this.addEdits(...(0, importStatementUtils_1.getTextEditsForAutoImportInsertion)(importNameInfo !== null && importNameInfo !== void 0 ? importNameInfo : [], moduleNameInfo, importStatements, importGroup, parseResults, (0, positionUtils_1.convertOffsetToPosition)(parseResults.parseTree.length, parseResults.tokenizerOutput.lines)).map((e) => ({ filePath, range: e.range, replacementText: e.replacementText })));
+    }
+    _tryUpdateImport(parseResults, importStatements, moduleNameInfo, importNameInfo, updateOptions) {
+        if (!updateOptions) {
+            return false;
+        }
+        // See whether we have existing from import statement for the same module
+        // ex) from [|moduleName|] import subModule
+        const imported = importStatements.orderedImports.find((i) => i.node.nodeType === 22 /* ImportFrom */ &&
+            (i.moduleName === moduleNameInfo.nameForImportFrom || i.moduleName === moduleNameInfo.name));
+        if (!imported || imported.node.nodeType !== 22 /* ImportFrom */ || imported.node.isWildcardImport) {
+            return false;
+        }
+        const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree).filePath;
+        const edits = (0, importStatementUtils_1.getTextEditsForAutoImportSymbolAddition)(importNameInfo, imported, parseResults);
+        if (imported.node !== updateOptions.currentFromImport) {
+            // Add what we want to the existing "import from" statement as long as it is not the same import
+            // node we are working on.
+            // ex) from xxx import yyy <= we are working on here.
+            //     from xxx import zzz <= but we found this.
+            this.addEdits(...edits.map((e) => ({ filePath, range: e.range, replacementText: e.replacementText })));
+            return true;
+        }
+        const moduleNames = updateOptions.originalModuleName.split('.');
+        const newModuleNames = moduleNameInfo.name.split('.');
+        if (!(0, importStatementUtils_1.haveSameParentModule)(moduleNames, newModuleNames)) {
+            // Module has moved.
+            return false;
+        }
+        // Check whether we can avoid creating a new statement. We can't just merge with existing one since
+        // we could create invalid text edits (2 edits that change the same span, or invalid replacement text since
+        // texts on the node has changed)
+        if (importNameInfo.length !== 1 || edits.length !== 1) {
+            return false;
+        }
+        const deletions = this._getDeletionsForSpan(filePath, edits[0].range);
+        if (deletions.length === 0) {
+            this.addEdit(filePath, edits[0].range, edits[0].replacementText);
+            return true;
+        }
+        const lastModuleName = moduleNames[moduleNames.length - 1];
+        const newLastModuleName = newModuleNames[newModuleNames.length - 1];
+        const alias = importNameInfo[0].alias === newLastModuleName ? lastModuleName : importNameInfo[0].alias;
+        const importName = updateOptions.currentFromImport.imports.find((i) => { var _a; return i.name.value === lastModuleName && ((_a = i.alias) === null || _a === void 0 ? void 0 : _a.value) === alias; });
+        if (!importName) {
+            return false;
+        }
+        this._removeEdits(filePath, deletions);
+        if (importName.alias) {
+            this._nodesRemoved.delete(importName.alias);
+        }
+        this.addEdit(filePath, (0, positionUtils_1.convertTextRangeToRange)(importName.name, parseResults.tokenizerOutput.lines), newLastModuleName);
+        return true;
+    }
+    _getDeletionsForSpan(filePathOrEdit, range) {
+        const edits = this._getOverlappingForSpan(filePathOrEdit, range);
+        return edits.filter((e) => e.replacementText === '');
+    }
+    _removeEdits(filePathOrEdit, edits) {
+        var _a;
+        if ((0, core_1.isString)(filePathOrEdit)) {
+            filePathOrEdit = (_a = this._results.get(filePathOrEdit)) !== null && _a !== void 0 ? _a : [];
+        }
+        (0, collectionUtils_1.removeArrayElements)(filePathOrEdit, (f) => edits.some((e) => editAction_1.FileEditAction.areEqual(f, e)));
+    }
+    _getEditsToMerge(edits, range, replacementText) {
+        const overlappingEdits = this._getOverlappingForSpan(edits, range);
+        if (this._mergeOnlyDuplications && overlappingEdits.length > 0) {
+            // Merge duplicated deletion. For deletion, we can even merge edits
+            // intersecting each other.
+            if (replacementText === '') {
+                return overlappingEdits.filter((e) => e.replacementText === '');
+            }
+            // Merge duplicated edits as long as one of them contains the other.
+            return overlappingEdits.filter((e) => e.replacementText === replacementText &&
+                ((0, textRange_1.doesRangeContain)(range, e.range) || (0, textRange_1.doesRangeContain)(e.range, range)));
+        }
+        // We are allowed to merge more than exact duplication. If the existing edit
+        // is deletion or duplicated text with containing ranges, merge them to 1.
+        return overlappingEdits.filter((e) => e.replacementText === '' ||
+            (e.replacementText === replacementText &&
+                ((0, textRange_1.doesRangeContain)(range, e.range) || (0, textRange_1.doesRangeContain)(e.range, range))));
+    }
+    _getOverlappingForSpan(filePathOrEdit, range) {
+        var _a;
+        if ((0, core_1.isString)(filePathOrEdit)) {
+            filePathOrEdit = (_a = this._results.get(filePathOrEdit)) !== null && _a !== void 0 ? _a : [];
+        }
+        return filePathOrEdit.filter((e) => (0, textRange_1.doRangesIntersect)(e.range, range));
+    }
     _processNodeRemoved(token) {
-        while (this._nodesRemoved.length > 0) {
-            const numberOfNodesBeforeProcessing = this._nodesRemoved.length;
-            const peekNodeToRemove = this._nodesRemoved[this._nodesRemoved.length - 1];
+        while (this._pendingNodeToRemove.length > 0) {
+            const numberOfNodesBeforeProcessing = this._pendingNodeToRemove.length;
+            const peekNodeToRemove = this._pendingNodeToRemove[this._pendingNodeToRemove.length - 1];
             this._handleImportNameNode(peekNodeToRemove, token);
-            if (this._nodesRemoved.length === numberOfNodesBeforeProcessing) {
+            if (this._pendingNodeToRemove.length === numberOfNodesBeforeProcessing) {
                 // It looks like we don't know how to handle the node,
                 // Please add code to handle the case.
                 debug.assert(`please add handler for ${peekNodeToRemove.node.nodeType}`);
                 // As a default behavior, we will just remove the node
-                this._nodesRemoved.pop();
+                this._pendingNodeToRemove.pop();
                 const info = (0, analyzerNodeInfo_1.getFileInfo)(peekNodeToRemove.parseResults.parseTree);
                 this.addEdit(info.filePath, (0, positionUtils_1.convertTextRangeToRange)(peekNodeToRemove.node, info.lines), '');
             }
         }
     }
-    _handleImportNameNode(peekNodeToRemove, token) {
-        const peekNode = peekNodeToRemove.node;
-        if (peekNode.nodeType !== 38 /* Name */) {
+    _handleImportNameNode(nodeToRemove, token) {
+        const node = nodeToRemove.node;
+        if (node.nodeType !== 38 /* Name */) {
             return false;
         }
-        const module = peekNodeToRemove.parseResults.parseTree;
+        const module = nodeToRemove.parseResults.parseTree;
         const info = (0, analyzerNodeInfo_1.getFileInfo)(module);
-        const importNode = (0, importStatementUtils_1.getContainingImportStatement)(ParseTreeUtils.findNodeByOffset(module, peekNode.start), token);
+        const importNode = (0, importStatementUtils_1.getContainingImportStatement)(ParseTreeUtils.findNodeByOffset(module, node.start), token);
         if (!importNode) {
             return false;
         }
         const nameNodes = (0, importStatementUtils_1.getAllImportNames)(importNode);
         // check various different cases
         // 1. check whether all imported names in the import statement is not used.
-        const nodesRemoved = this._nodesRemoved.filter((nodeToRemove) => nameNodes.some((n) => textRange_1.TextRange.overlapsRange(nodeToRemove.node, n)));
+        const nodesRemoved = this._pendingNodeToRemove.filter((nodeToRemove) => nameNodes.some((n) => textRange_1.TextRange.overlapsRange(nodeToRemove.node, n)));
         if (nameNodes.length === nodesRemoved.length) {
-            this.addEdit(info.filePath, ParseTreeUtils.getFullStatementRange(importNode, peekNodeToRemove.parseResults.tokenizerOutput), '');
+            this.addEdit(info.filePath, ParseTreeUtils.getFullStatementRange(importNode, nodeToRemove.parseResults), '');
             // Remove nodes that are handled from queue.
             this._removeNodesHandled(nodesRemoved);
             return true;
@@ -160,7 +319,25 @@ class TextEditTracker {
         return true;
     }
     _removeNodesHandled(nodesRemoved) {
-        (0, collectionUtils_1.removeArrayElements)(this._nodesRemoved, (n) => nodesRemoved.some((r) => r === n));
+        nodesRemoved.forEach((n) => this._markNodeRemoved(n.node, n.parseResults));
+        (0, collectionUtils_1.removeArrayElements)(this._pendingNodeToRemove, (n) => this._nodesRemoved.has(n.node));
+    }
+    _markNodeRemoved(nodeToDelete, parseResults) {
+        // Mark that we don't need to process these node again later.
+        this._nodesRemoved.set(nodeToDelete, parseResults);
+        if (nodeToDelete.nodeType === 21 /* ImportAs */) {
+            this._nodesRemoved.set(nodeToDelete.module, parseResults);
+            nodeToDelete.module.nameParts.forEach((n) => this._nodesRemoved.set(n, parseResults));
+            if (nodeToDelete.alias) {
+                this._nodesRemoved.set(nodeToDelete.alias, parseResults);
+            }
+        }
+        else if (nodeToDelete.nodeType === 23 /* ImportFromAs */) {
+            this._nodesRemoved.set(nodeToDelete.name, parseResults);
+            if (nodeToDelete.alias) {
+                this._nodesRemoved.set(nodeToDelete.alias, parseResults);
+            }
+        }
     }
 }
 exports.TextEditTracker = TextEditTracker;

package/dist/common/textEditUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"textEditUtils.js","sourceRoot":"","sources":["../../../src/common/textEditUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"textEditUtils.js","sourceRoot":"","sources":["../../../src/common/textEditUtils.ts"],"names":[],"mappings":"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"}

package/dist/languageServerBase.d.ts

@@ -13,6 +13,7 @@ import { CancellationProvider } from './common/cancellationUtils';
 import { DiagnosticSeverityOverrides, DiagnosticSeverityOverridesMap } from './common/commandLineOptions';
 import { ConfigOptions, SignatureDisplayType } from './common/configOptions';
 import { ConsoleInterface, LogLevel } from './common/console';
+import { TaskListToken } from './common/diagnostic';
 import { DiagnosticRule } from './common/diagnosticRules';
 import { FileDiagnostics } from './common/diagnosticSink';
 import { FileSystem, FileWatcherHandler } from './common/fileSystem';
@@ -48,6 +49,7 @@ export interface ServerSettings {
     fileSpecs?: string[];
     excludeFileSpecs?: string[];
     ignoreFileSpecs?: string[];
+    taskListTokens?: TaskListToken[];
     functionSignatureDisplay?: SignatureDisplayType | undefined;
 }
 export declare enum WellKnownWorkspaceKinds {
@@ -139,6 +141,7 @@ interface ClientCapabilities {
     signatureDocFormat: MarkupKind;
     supportsDeprecatedDiagnosticTag: boolean;
     supportsUnnecessaryDiagnosticTag: boolean;
+    supportsTaskItemDiagnosticTag: boolean;
     completionItemResolveSupportsAdditionalTextEdits: boolean;
 }
 export declare abstract class LanguageServerBase implements LanguageServerInterface {

package/dist/languageServerBase.js

@@ -25,6 +25,8 @@ const commandLineOptions_1 = require("./common/commandLineOptions");
 const configOptions_1 = require("./common/configOptions");
 const console_1 = require("./common/console");
 const deferred_1 = require("./common/deferred");
+const diagnostic_1 = require("./common/diagnostic");
+const extensibility_1 = require("./common/extensibility");
 const lspUtils_1 = require("./common/lspUtils");
 const pathUtils_1 = require("./common/pathUtils");
 const progressReporter_1 = require("./common/progressReporter");
@@ -77,6 +79,64 @@ function createInitStatus() {
 }
 exports.createInitStatus = createInitStatus;
 const nullProgressReporter = (0, progress_1.attachWorkDone)(undefined, /* params */ undefined);
+/*
+ * Additional DiagnosticTag values that are specific to Visual Studio.
+ * These must match the values in https://dev.azure.com/devdiv/DevDiv/_git/vslanguageserverclient?path=%2Fsrc%2Fproduct%2FProtocol%2FLanguageServer.Protocol.Extensions%2FVSDiagnosticTags.cs&version=GBdevelop&_a=contents
+ */
+var VSDiagnosticTag;
+(function (VSDiagnosticTag) {
+    /**
+     * A diagnostic entry generated by the build.
+     */
+    VSDiagnosticTag.BuildError = -1;
+    /**
+     * A diagnostic entry generated by Intellisense.
+     */
+    VSDiagnosticTag.IntellisenseError = -2;
+    /**
+     * A diagnostic entry that could be generated from both builds and Intellisense.
+     *
+     * Diagnostic entries tagged with PotentialDuplicate will be hidden
+     * in the error list if the error list is displaying build and intellisense errors.
+     */
+    VSDiagnosticTag.PotentialDuplicate = -3;
+    /**
+     * A diagnostic entry that is never displayed in the error list.
+     */
+    VSDiagnosticTag.HiddenInErrorList = -4;
+    /**
+     * A diagnostic entry that is always displayed in the error list.
+     */
+    VSDiagnosticTag.VisibleInErrorList = -5;
+    /**
+     * A diagnostic entry that is never displayed in the editor.
+     */
+    VSDiagnosticTag.HiddenInEditor = -6;
+    /**
+     * No tooltip is shown for the Diagnostic entry in the editor.
+     */
+    VSDiagnosticTag.SuppressEditorToolTip = -7;
+    /**
+     * A diagnostic entry that is represented in the editor as an Edit and Continue error.
+     */
+    VSDiagnosticTag.EditAndContinueError = -8;
+    /**
+     * A diagnostic entry that is represented in the editor as a Task List item (View -> Task List)
+     */
+    VSDiagnosticTag.TaskItem = -9;
+})(VSDiagnosticTag || (VSDiagnosticTag = {}));
+/*
+ * DiagnosticRank values that are specific to Visual Studio.
+ * These must match the values in https://dev.azure.com/devdiv/DevDiv/_git/vslanguageserverclient?path=/src/product/Protocol/LanguageServer.Protocol.Extensions/VSDiagnosticRank.cs&version=GBdevelop&_a=contents
+ */
+var VSDiagnosticRank;
+(function (VSDiagnosticRank) {
+    VSDiagnosticRank.Highest = 100;
+    VSDiagnosticRank.High = 200;
+    VSDiagnosticRank.Default = 300;
+    VSDiagnosticRank.Low = 400;
+    VSDiagnosticRank.Lowest = 500;
+})(VSDiagnosticRank || (VSDiagnosticRank = {}));
 class LanguageServerBase {
     constructor(_serverOptions, _connection, console, uriParserFactory = (fs) => new uriParser_1.UriParser(fs)) {
         var _a, _b;
@@ -106,6 +166,7 @@ class LanguageServerBase {
             signatureDocFormat: vscode_languageserver_1.MarkupKind.PlainText,
             supportsDeprecatedDiagnosticTag: false,
             supportsUnnecessaryDiagnosticTag: false,
+            supportsTaskItemDiagnosticTag: false,
             completionItemResolveSupportsAdditionalTextEdits: false,
         };
         // Stash the base directory into a global variable.
@@ -129,6 +190,8 @@ class LanguageServerBase {
         this._progressReporter = new progressReporter_1.ProgressReportTracker(this.createProgressReporter());
         // Listen on the connection.
         this._connection.listen();
+        // Setup extensions
+        extensibility_1.Extensions.createLanguageServiceExtensions(this);
     }
     // Convert uri to path
     decodeTextDocumentUri(uriString) {
@@ -265,7 +328,7 @@ class LanguageServerBase {
         this.client.hasWatchFileRelativePathCapability =
             !!((_e = (_d = capabilities.workspace) === null || _d === void 0 ? void 0 : _d.didChangeWatchedFiles) === null || _e === void 0 ? void 0 : _e.relativePatternSupport);
         this.client.hasWorkspaceFoldersCapability = !!((_f = capabilities.workspace) === null || _f === void 0 ? void 0 : _f.workspaceFolders);
-        this.client.hasVisualStudioExtensionsCapability = !!capabilities.supportsVisualStudioExtensions;
+        this.client.hasVisualStudioExtensionsCapability = !!capabilities._vs_supportsVisualStudioExtensions;
         this.client.hasActiveParameterCapability =
             !!((_j = (_h = (_g = capabilities.textDocument) === null || _g === void 0 ? void 0 : _g.signatureHelp) === null || _h === void 0 ? void 0 : _h.signatureInformation) === null || _j === void 0 ? void 0 : _j.activeParameterSupport);
         this.client.hasSignatureLabelOffsetCapability =
@@ -286,6 +349,8 @@ class LanguageServerBase {
         const supportedDiagnosticTags = ((_13 = (_12 = (_11 = capabilities.textDocument) === null || _11 === void 0 ? void 0 : _11.publishDiagnostics) === null || _12 === void 0 ? void 0 : _12.tagSupport) === null || _13 === void 0 ? void 0 : _13.valueSet) || [];
         this.client.supportsUnnecessaryDiagnosticTag = supportedDiagnosticTags.some((tag) => tag === vscode_languageserver_1.DiagnosticTag.Unnecessary);
         this.client.supportsDeprecatedDiagnosticTag = supportedDiagnosticTags.some((tag) => tag === vscode_languageserver_1.DiagnosticTag.Deprecated);
+        // if the client is running in VS, it always supports task item diagnostics
+        this.client.supportsTaskItemDiagnosticTag = this.client.hasVisualStudioExtensionsCapability;
         this.client.hasWindowProgressCapability = !!((_14 = capabilities.window) === null || _14 === void 0 ? void 0 : _14.workDoneProgress);
         this.client.hasGoToDeclarationCapability = !!((_15 = capabilities.textDocument) === null || _15 === void 0 ? void 0 : _15.declaration);
         this.client.completionItemResolveSupportsAdditionalTextEdits =
@@ -955,6 +1020,29 @@ class LanguageServerBase {
                     return;
                 }
             }
+            else if (diag.category === 6 /* TaskItem */) {
+                vsDiag.tags = [VSDiagnosticTag.TaskItem];
+                // Map the task item priority to a value VS will understand
+                // and store it in the diagnostic.
+                // The Diagnostic type is defined in a protocol that we can't change,
+                // so we just dynamically create the vsDiag._vs_diagnosticRank property at runtime,
+                // which is what VS is looking for.
+                switch (diag.priority) {
+                    case diagnostic_1.TaskListPriority.High:
+                        vsDiag._vs_diagnosticRank = VSDiagnosticRank.High;
+                        break;
+                    case diagnostic_1.TaskListPriority.Normal:
+                        vsDiag._vs_diagnosticRank = VSDiagnosticRank.Default;
+                        break;
+                    case diagnostic_1.TaskListPriority.Low:
+                        vsDiag._vs_diagnosticRank = VSDiagnosticRank.Low;
+                        break;
+                }
+                // if the client doesn't support "taskitem" tags, don't report.
+                if (!this.client.supportsTaskItemDiagnosticTag) {
+                    return;
+                }
+            }
             if (rule) {
                 const ruleDocUrl = this.getDocumentationUrlForDiagnosticRule(rule);
                 if (ruleDocUrl) {
@@ -978,6 +1066,7 @@ class LanguageServerBase {
                 case 1 /* Warning */:
                     return vscode_languageserver_1.DiagnosticSeverity.Warning;
                 case 2 /* Information */:
+                case 6 /* TaskItem */: // task items only show up in the task list if they are information or above.
                     return vscode_languageserver_1.DiagnosticSeverity.Information;
                 case 3 /* UnusedCode */:
                 case 4 /* UnreachableCode */: