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

package/dist/common/workspaceEditUtils.js

@@ -7,74 +7,74 @@
  * Convert Pyright's FileEditActions to LanguageServer's WorkspaceEdits.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateWorkspaceEdits = exports.applyDocumentChanges = exports.applyWorkspaceEdits = exports.convertWorkspaceDocumentEdits = exports.AddToWorkspaceEdit = exports.convertWorkspaceEdits = void 0;
+exports.generateWorkspaceEdit = exports.applyDocumentChanges = exports.applyWorkspaceEdit = exports.applyTextEditsToString = exports.appendToWorkspaceEdit = exports.convertToWorkspaceEdit = exports.convertToFileTextEdits = exports.convertToTextEdits = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const pathUtils_1 = require("../common/pathUtils");
 const collectionUtils_1 = require("./collectionUtils");
+const core_1 = require("./core");
 const debug_1 = require("./debug");
 const positionUtils_1 = require("./positionUtils");
-function convertWorkspaceEdits(fs, edits) {
-    const workspaceEdit = {
-        changes: {},
-    };
-    AddToWorkspaceEdit(fs, workspaceEdit, edits);
-    return workspaceEdit;
+const textRange_1 = require("./textRange");
+function convertToTextEdits(editActions) {
+    return editActions.map((editAction) => ({
+        range: editAction.range,
+        newText: editAction.replacementText,
+    }));
+}
+exports.convertToTextEdits = convertToTextEdits;
+function convertToFileTextEdits(filePath, editActions) {
+    return editActions.map((a) => ({ filePath, ...a }));
+}
+exports.convertToFileTextEdits = convertToFileTextEdits;
+function convertToWorkspaceEdit(fs, edits, changeAnnotations, defaultAnnotationId = 'default') {
+    if ((0, core_1.isArray)(edits)) {
+        return _convertToWorkspaceEditWithChanges(fs, edits);
+    }
+    return _convertToWorkspaceEditWithDocumentChanges(fs, edits, changeAnnotations, defaultAnnotationId);
 }
-exports.convertWorkspaceEdits = convertWorkspaceEdits;
-function AddToWorkspaceEdit(fs, workspaceEdit, edits) {
+exports.convertToWorkspaceEdit = convertToWorkspaceEdit;
+function appendToWorkspaceEdit(fs, edits, workspaceEdit) {
     edits.forEach((edit) => {
         const uri = (0, pathUtils_1.convertPathToUri)(fs, edit.filePath);
         workspaceEdit.changes[uri] = workspaceEdit.changes[uri] || [];
         workspaceEdit.changes[uri].push({ range: edit.range, newText: edit.replacementText });
     });
 }
-exports.AddToWorkspaceEdit = AddToWorkspaceEdit;
-function convertWorkspaceDocumentEdits(fs, editActions, changeAnnotations, defaultAnnotationId = 'default') {
-    const workspaceEdit = {
-        documentChanges: [],
-        changeAnnotations: changeAnnotations,
-    };
-    const mapPerFile = (0, collectionUtils_1.createMapFromItems)(editActions.edits, (e) => e.filePath);
-    for (const [key, value] of mapPerFile) {
-        workspaceEdit.documentChanges.push(vscode_languageserver_1.TextDocumentEdit.create({ uri: (0, pathUtils_1.convertPathToUri)(fs, key), version: null }, [
-            ...value.map((v) => ({
-                range: v.range,
-                newText: v.replacementText,
-                annotationId: defaultAnnotationId,
-            })),
-        ]));
-    }
-    for (const operation of editActions.fileOperations) {
-        switch (operation.kind) {
-            case 'create':
-                workspaceEdit.documentChanges.push(vscode_languageserver_1.CreateFile.create((0, pathUtils_1.convertPathToUri)(fs, operation.filePath), 
-                /* options */ undefined, defaultAnnotationId));
-                break;
-            case 'rename':
-                workspaceEdit.documentChanges.push(vscode_languageserver_1.RenameFile.create((0, pathUtils_1.convertPathToUri)(fs, operation.oldFilePath), (0, pathUtils_1.convertPathToUri)(fs, operation.newFilePath), 
-                /* options */ undefined, defaultAnnotationId));
-                break;
-            case 'delete':
-                workspaceEdit.documentChanges.push(vscode_languageserver_1.DeleteFile.create((0, pathUtils_1.convertPathToUri)(fs, operation.filePath), 
-                /* options */ undefined, defaultAnnotationId));
-                break;
-            default:
-                (0, debug_1.assertNever)(operation);
+exports.appendToWorkspaceEdit = appendToWorkspaceEdit;
+function applyTextEditsToString(edits, lines, originalText) {
+    const editsWithOffset = edits
+        .map((e) => {
+        var _a;
+        return ({
+            range: (_a = (0, positionUtils_1.convertRangeToTextRange)(e.range, lines)) !== null && _a !== void 0 ? _a : { start: originalText.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 = originalText;
+    for (const change of editsWithOffset) {
+        current = current.substr(0, change.range.start) + change.text + current.substr(textRange_1.TextRange.getEnd(change.range));
     }
-    return workspaceEdit;
+    return current;
 }
-exports.convertWorkspaceDocumentEdits = convertWorkspaceDocumentEdits;
-function applyWorkspaceEdits(service, edits, filesChanged) {
+exports.applyTextEditsToString = applyTextEditsToString;
+function applyWorkspaceEdit(clonedService, edits, filesChanged) {
     if (edits.changes) {
         for (const kv of Object.entries(edits.changes)) {
-            const filePath = (0, pathUtils_1.convertUriToPath)(service.fs, kv[0]);
-            const fileInfo = service.backgroundAnalysisProgram.program.getSourceFileInfo(filePath);
+            const filePath = (0, pathUtils_1.convertUriToPath)(clonedService.fs, kv[0]);
+            const fileInfo = clonedService.backgroundAnalysisProgram.program.getSourceFileInfo(filePath);
             if (!fileInfo || !fileInfo.isTracked) {
                 // We don't allow non user file being modified.
                 continue;
             }
-            applyDocumentChanges(service, fileInfo, kv[1]);
+            applyDocumentChanges(clonedService, fileInfo, kv[1]);
             filesChanged.add(filePath);
         }
     }
@@ -82,13 +82,13 @@ function applyWorkspaceEdits(service, edits, filesChanged) {
     if (edits.documentChanges) {
         for (const change of edits.documentChanges) {
             if (vscode_languageserver_1.TextDocumentEdit.is(change)) {
-                const filePath = (0, pathUtils_1.convertUriToPath)(service.fs, change.textDocument.uri);
-                const fileInfo = service.backgroundAnalysisProgram.program.getSourceFileInfo(filePath);
+                const filePath = (0, pathUtils_1.convertUriToPath)(clonedService.fs, change.textDocument.uri);
+                const fileInfo = clonedService.backgroundAnalysisProgram.program.getSourceFileInfo(filePath);
                 if (!fileInfo || !fileInfo.isTracked) {
                     // We don't allow non user file being modified.
                     continue;
                 }
-                applyDocumentChanges(service, fileInfo, change.edits);
+                applyDocumentChanges(clonedService, fileInfo, change.edits);
                 filesChanged.add(filePath);
             }
             // For now, we don't support other kinds of text changes.
@@ -96,18 +96,18 @@ function applyWorkspaceEdits(service, edits, filesChanged) {
         }
     }
 }
-exports.applyWorkspaceEdits = applyWorkspaceEdits;
-function applyDocumentChanges(service, fileInfo, edits) {
+exports.applyWorkspaceEdit = applyWorkspaceEdit;
+function applyDocumentChanges(clonedService, fileInfo, edits) {
     var _a;
     if (!fileInfo.isOpenByClient) {
         const fileContent = fileInfo.sourceFile.getFileContent();
-        service.setFileOpened(fileInfo.sourceFile.getFilePath(), 0, fileContent !== null && fileContent !== void 0 ? fileContent : '', fileInfo.sourceFile.getIPythonMode(), fileInfo.sourceFile.getRealFilePath());
+        clonedService.setFileOpened(fileInfo.sourceFile.getFilePath(), 0, fileContent !== null && fileContent !== void 0 ? fileContent : '', fileInfo.sourceFile.getIPythonMode(), fileInfo.sourceFile.getRealFilePath());
     }
     const version = ((_a = fileInfo.sourceFile.getClientVersion()) !== null && _a !== void 0 ? _a : 0) + 1;
-    service.updateOpenFileContents(fileInfo.sourceFile.getFilePath(), version, edits.map((t) => ({ range: t.range, text: t.newText })), fileInfo.sourceFile.getIPythonMode(), fileInfo.sourceFile.getRealFilePath());
+    clonedService.updateOpenFileContents(fileInfo.sourceFile.getFilePath(), version, edits.map((t) => ({ range: t.range, text: t.newText })), fileInfo.sourceFile.getIPythonMode(), fileInfo.sourceFile.getRealFilePath());
 }
 exports.applyDocumentChanges = applyDocumentChanges;
-function generateWorkspaceEdits(base, target, filesChanged) {
+function generateWorkspaceEdit(originalService, clonedService, filesChanged) {
     var _a;
     // For now, we won't do text diff to find out minimal text changes. instead, we will
     // consider whole text of the files are changed. In future, we could consider
@@ -115,8 +115,8 @@ function generateWorkspaceEdits(base, target, filesChanged) {
     // to support annotation.
     const edits = { changes: {} };
     for (const filePath of filesChanged) {
-        const original = base.backgroundAnalysisProgram.program.getBoundSourceFile(filePath);
-        const final = target.backgroundAnalysisProgram.program.getBoundSourceFile(filePath);
+        const original = originalService.backgroundAnalysisProgram.program.getBoundSourceFile(filePath);
+        const final = clonedService.backgroundAnalysisProgram.program.getBoundSourceFile(filePath);
         if (!original || !final) {
             // Both must exist.
             continue;
@@ -125,7 +125,7 @@ function generateWorkspaceEdits(base, target, filesChanged) {
         if (!parseResults) {
             continue;
         }
-        edits.changes[(0, pathUtils_1.convertPathToUri)(base.fs, filePath)] = [
+        edits.changes[(0, pathUtils_1.convertPathToUri)(originalService.fs, filePath)] = [
             {
                 range: (0, positionUtils_1.convertTextRangeToRange)(parseResults.parseTree, parseResults.tokenizerOutput.lines),
                 newText: (_a = final.getFileContent()) !== null && _a !== void 0 ? _a : '',
@@ -134,5 +134,61 @@ function generateWorkspaceEdits(base, target, filesChanged) {
     }
     return edits;
 }
-exports.generateWorkspaceEdits = generateWorkspaceEdits;
+exports.generateWorkspaceEdit = generateWorkspaceEdit;
+function _convertToWorkspaceEditWithChanges(fs, edits) {
+    const workspaceEdit = {
+        changes: {},
+    };
+    appendToWorkspaceEdit(fs, edits, workspaceEdit);
+    return workspaceEdit;
+}
+function _convertToWorkspaceEditWithDocumentChanges(fs, editActions, changeAnnotations, defaultAnnotationId = 'default') {
+    const workspaceEdit = {
+        documentChanges: [],
+        changeAnnotations: changeAnnotations,
+    };
+    // Ordering of documentChanges are important.
+    // Make sure create operaiton happens before edits
+    for (const operation of editActions.fileOperations) {
+        switch (operation.kind) {
+            case 'create':
+                workspaceEdit.documentChanges.push(vscode_languageserver_1.CreateFile.create((0, pathUtils_1.convertPathToUri)(fs, operation.filePath), 
+                /* options */ undefined, defaultAnnotationId));
+                break;
+            case 'rename':
+            case 'delete':
+                break;
+            default:
+                (0, debug_1.assertNever)(operation);
+        }
+    }
+    // Text edit's file path must refer to original file paths unless it is a new file just created.
+    const mapPerFile = (0, collectionUtils_1.createMapFromItems)(editActions.edits, (e) => e.filePath);
+    for (const [key, value] of mapPerFile) {
+        workspaceEdit.documentChanges.push(vscode_languageserver_1.TextDocumentEdit.create({ uri: (0, pathUtils_1.convertPathToUri)(fs, key), version: null }, [
+            ...value.map((v) => ({
+                range: v.range,
+                newText: v.replacementText,
+                annotationId: defaultAnnotationId,
+            })),
+        ]));
+    }
+    for (const operation of editActions.fileOperations) {
+        switch (operation.kind) {
+            case 'create':
+                break;
+            case 'rename':
+                workspaceEdit.documentChanges.push(vscode_languageserver_1.RenameFile.create((0, pathUtils_1.convertPathToUri)(fs, operation.oldFilePath), (0, pathUtils_1.convertPathToUri)(fs, operation.newFilePath), 
+                /* options */ undefined, defaultAnnotationId));
+                break;
+            case 'delete':
+                workspaceEdit.documentChanges.push(vscode_languageserver_1.DeleteFile.create((0, pathUtils_1.convertPathToUri)(fs, operation.filePath), 
+                /* options */ undefined, defaultAnnotationId));
+                break;
+            default:
+                (0, debug_1.assertNever)(operation);
+        }
+    }
+    return workspaceEdit;
+}
 //# sourceMappingURL=workspaceEditUtils.js.map

package/dist/common/workspaceEditUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspaceEditUtils.js","sourceRoot":"","sources":["../../../src/common/workspaceEditUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspaceEditUtils.js","sourceRoot":"","sources":["../../../src/common/workspaceEditUtils.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 =
@@ -632,7 +697,7 @@ class LanguageServerBase {
         if (!editActions) {
             return undefined;
         }
-        return (0, workspaceEditUtils_1.convertWorkspaceDocumentEdits)(workspace.serviceInstance.fs, editActions);
+        return (0, workspaceEditUtils_1.convertToWorkspaceEdit)(workspace.serviceInstance.fs, editActions);
     }
     async onPrepare(params, token) {
         const { filePath, position } = this._uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
@@ -920,7 +985,7 @@ class LanguageServerBase {
         // created by the LSP library. If it's the latter, we'll create a server-initiated
         // progress reporter.
         if (reporter.constructor !== nullProgressReporter.constructor) {
-            return { reporter: reporter, source: (0, cancellationUtils_1.CancelAfter)(token) };
+            return { reporter: reporter, source: (0, cancellationUtils_1.CancelAfter)(this._serverOptions.cancellationProvider, token) };
         }
         const serverInitiatedReporter = await this._connection.window.createWorkDoneProgress();
         serverInitiatedReporter.begin(title, 
@@ -929,7 +994,7 @@ class LanguageServerBase {
         /* cancellable */ true);
         return {
             reporter: serverInitiatedReporter,
-            source: (0, cancellationUtils_1.CancelAfter)(token, serverInitiatedReporter.token),
+            source: (0, cancellationUtils_1.CancelAfter)(this._serverOptions.cancellationProvider, token, serverInitiatedReporter.token),
         };
     }
     _convertDiagnostics(fs, diags) {
@@ -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 */: