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

package/dist/common/core.d.ts

@@ -1,3 +1,4 @@
+import { TextRange } from './textRange';
 export declare const enum Comparison {
     LessThan = -1,
     EqualTo = 0,
@@ -66,4 +67,5 @@ interface Thenable<T> {
 export declare function isThenable<T>(v: any): v is Thenable<T>;
 export declare function isDefined<T>(element: T | undefined): element is T;
 export declare function getEnumNames<T>(enumType: T): string[];
+export declare function containsOnlyWhitespace(text: string, span?: TextRange): boolean;
 export {};

package/dist/common/core.js

@@ -7,7 +7,8 @@
  * Various helpers that don't have a dependency on other code files.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnumNames = exports.isDefined = exports.isThenable = exports.isDebugMode = exports.test_setDebugMode = exports.toBoolean = exports.hasProperty = exports.isBoolean = exports.isNumber = exports.isString = exports.isArray = exports.compareValues = exports.compareComparableValues = exports.equateValues = exports.toLowerCase = exports.identity = exports.returnUndefined = exports.returnTrue = exports.returnFalse = exports.Comparison = void 0;
+exports.containsOnlyWhitespace = exports.getEnumNames = exports.isDefined = exports.isThenable = exports.isDebugMode = exports.test_setDebugMode = exports.toBoolean = exports.hasProperty = exports.isBoolean = exports.isNumber = exports.isString = exports.isArray = exports.compareValues = exports.compareComparableValues = exports.equateValues = exports.toLowerCase = exports.identity = exports.returnUndefined = exports.returnTrue = exports.returnFalse = exports.Comparison = void 0;
+const textRange_1 = require("./textRange");
 var Comparison;
 (function (Comparison) {
     Comparison[Comparison["LessThan"] = -1] = "LessThan";
@@ -142,4 +143,11 @@ function getEnumNames(enumType) {
     return result;
 }
 exports.getEnumNames = getEnumNames;
+function containsOnlyWhitespace(text, span) {
+    if (span) {
+        text = text.substring(span.start, textRange_1.TextRange.getEnd(span));
+    }
+    return /^\s*$/.test(text);
+}
+exports.containsOnlyWhitespace = containsOnlyWhitespace;
 //# sourceMappingURL=core.js.map

package/dist/common/core.js.map

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

package/dist/common/diagnostic.d.ts

@@ -1,6 +1,15 @@
 import { Commands } from '../commands/commands';
 import { DiagnosticLevel } from './configOptions';
 import { Range, TextRange } from './textRange';
+export declare enum TaskListPriority {
+    High = "High",
+    Normal = "Normal",
+    Low = "Low"
+}
+export interface TaskListToken {
+    text: string;
+    priority: TaskListPriority;
+}
 export declare const enum ActionKind {
     RenameShadowedFileAction = "renameShadowedFile"
 }
@@ -10,7 +19,8 @@ export declare const enum DiagnosticCategory {
     Information = 2,
     UnusedCode = 3,
     UnreachableCode = 4,
-    Deprecated = 5
+    Deprecated = 5,
+    TaskItem = 6
 }
 export declare function convertLevelToCategory(level: DiagnosticLevel): DiagnosticCategory.Error | DiagnosticCategory.Warning | DiagnosticCategory.Information;
 export interface DiagnosticAction {
@@ -37,20 +47,22 @@ export interface DiagnosticRelatedInfo {
     message: string;
     filePath: string;
     range: Range;
+    priority: TaskListPriority;
 }
 export declare class Diagnostic {
     readonly category: DiagnosticCategory;
     readonly message: string;
     readonly range: Range;
+    readonly priority: TaskListPriority;
     private _actions;
     private _rule;
     private _relatedInfo;
-    constructor(category: DiagnosticCategory, message: string, range: Range);
+    constructor(category: DiagnosticCategory, message: string, range: Range, priority?: TaskListPriority);
     addAction(action: DiagnosticAction): void;
     getActions(): DiagnosticAction[] | undefined;
     setRule(rule: string): void;
     getRule(): string | undefined;
-    addRelatedInfo(message: string, filePath: string, range: Range): void;
+    addRelatedInfo(message: string, filePath: string, range: Range, priority?: TaskListPriority): void;
     getRelatedInfo(): DiagnosticRelatedInfo[];
 }
 export declare class DiagnosticAddendum {

package/dist/common/diagnostic.js

@@ -8,11 +8,18 @@
  * Class that represents errors and warnings.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DiagnosticAddendum = exports.Diagnostic = exports.convertLevelToCategory = exports.DiagnosticCategory = exports.ActionKind = void 0;
+exports.DiagnosticAddendum = exports.Diagnostic = exports.convertLevelToCategory = exports.DiagnosticCategory = exports.ActionKind = exports.TaskListPriority = void 0;
 const collectionUtils_1 = require("./collectionUtils");
 const defaultMaxDepth = 5;
 const defaultMaxLineCount = 8;
 const maxRecursionCount = 64;
+// Corresponds to the CommentTaskPriority enum at https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_git/VS?path=src/env/shell/PackageFramework/Framework/CommentTaskPriority.cs
+var TaskListPriority;
+(function (TaskListPriority) {
+    TaskListPriority["High"] = "High";
+    TaskListPriority["Normal"] = "Normal";
+    TaskListPriority["Low"] = "Low";
+})(TaskListPriority = exports.TaskListPriority || (exports.TaskListPriority = {}));
 var ActionKind;
 (function (ActionKind) {
     ActionKind["RenameShadowedFileAction"] = "renameShadowedFile";
@@ -25,6 +32,7 @@ var DiagnosticCategory;
     DiagnosticCategory[DiagnosticCategory["UnusedCode"] = 3] = "UnusedCode";
     DiagnosticCategory[DiagnosticCategory["UnreachableCode"] = 4] = "UnreachableCode";
     DiagnosticCategory[DiagnosticCategory["Deprecated"] = 5] = "Deprecated";
+    DiagnosticCategory[DiagnosticCategory["TaskItem"] = 6] = "TaskItem";
 })(DiagnosticCategory = exports.DiagnosticCategory || (exports.DiagnosticCategory = {}));
 function convertLevelToCategory(level) {
     switch (level) {
@@ -41,10 +49,11 @@ function convertLevelToCategory(level) {
 exports.convertLevelToCategory = convertLevelToCategory;
 // Represents a single error or warning.
 class Diagnostic {
-    constructor(category, message, range) {
+    constructor(category, message, range, priority = TaskListPriority.Normal) {
         this.category = category;
         this.message = message;
         this.range = range;
+        this.priority = priority;
         this._relatedInfo = [];
     }
     addAction(action) {
@@ -64,8 +73,8 @@ class Diagnostic {
     getRule() {
         return this._rule;
     }
-    addRelatedInfo(message, filePath, range) {
-        this._relatedInfo.push({ filePath, message, range });
+    addRelatedInfo(message, filePath, range, priority = TaskListPriority.Normal) {
+        this._relatedInfo.push({ filePath, message, range, priority });
     }
     getRelatedInfo() {
         return this._relatedInfo;

package/dist/common/diagnostic.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostic.js","sourceRoot":"","sources":["../../../src/common/diagnostic.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAGH,uDAAgD;AAIhD,MAAM,eAAe,GAAG,CAAC,CAAC;AAC1B,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAE7B,IAAkB,UAEjB;AAFD,WAAkB,UAAU;IACxB,6DAA+C,CAAA;AACnD,CAAC,EAFiB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAE3B;AAED,IAAkB,kBAOjB;AAPD,WAAkB,kBAAkB;IAChC,6DAAK,CAAA;IACL,iEAAO,CAAA;IACP,yEAAW,CAAA;IACX,uEAAU,CAAA;IACV,iFAAe,CAAA;IACf,uEAAU,CAAA;AACd,CAAC,EAPiB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAOnC;AAED,SAAgB,sBAAsB,CAAC,KAAsB;IACzD,QAAQ,KAAK,EAAE;QACX,KAAK,OAAO;YACR,qBAAgC;QAEpC,KAAK,SAAS;YACV,uBAAkC;QAEtC,KAAK,aAAa;YACd,2BAAsC;QAE1C;YACI,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,kBAAkB,CAAC,CAAC;KACnD;AACL,CAAC;AAdD,wDAcC;AAiCD,wCAAwC;AACxC,MAAa,UAAU;IAKnB,YAAqB,QAA4B,EAAW,OAAe,EAAW,KAAY;QAA7E,aAAQ,GAAR,QAAQ,CAAoB;QAAW,YAAO,GAAP,OAAO,CAAQ;QAAW,UAAK,GAAL,KAAK,CAAO;QAF1F,iBAAY,GAA4B,EAAE,CAAC;IAEkD,CAAC;IAEtG,SAAS,CAAC,MAAwB;QAC9B,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;YAC7B,IAAI,CAAC,QAAQ,GAAG,CAAC,MAAM,CAAC,CAAC;SAC5B;aAAM;YACH,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC9B;IACL,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,OAAO,CAAC,IAAY;QAChB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,cAAc,CAAC,OAAe,EAAE,QAAgB,EAAE,KAAY;QAC1D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;CACJ;AAlCD,gCAkCC;AAED,6EAA6E;AAC7E,yEAAyE;AACzE,MAAa,kBAAkB;IAA/B;QACY,cAAS,GAAa,EAAE,CAAC;QACzB,kBAAa,GAAyB,EAAE,CAAC;IAmIrD,CAAC;IA5HG,UAAU,CAAC,OAAe;QACtB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,KAAgB;QACzB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,iEAAiE;IACjE,cAAc;QACV,MAAM,WAAW,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAC7C,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAC9B,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,SAAS,CAAC,QAAQ,GAAG,eAAe,EAAE,YAAY,GAAG,mBAAmB;QACpE,IAAI,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAE5D,IAAI,KAAK,CAAC,MAAM,GAAG,YAAY,EAAE;YAC7B,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;YACrC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACvB;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACjB,OAAO,IAAI,GAAG,IAAI,CAAC;SACtB;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;IAED,WAAW,CAAC,QAA4B;QACpC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,iEAAiE;IACjE,wEAAwE;IACxE,cAAc;IACd,qBAAqB;QACjB,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAE5C,mEAAmE;QACnE,wDAAwD;QACxD,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,MAAK,CAAC,EAAE;YACrB,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAEO,sBAAsB,CAAC,cAAc,GAAG,CAAC;QAC7C,IAAI,cAAc,GAAG,iBAAiB,EAAE;YACpC,OAAO,SAAS,CAAC;SACpB;QACD,cAAc,EAAE,CAAC;QAEjB,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa;aACjC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC;aAC5D,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAExB,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;SAClC;QAED,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,OAAO,IAAI,CAAC,MAAM,CAAC;SACtB;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAEO,gBAAgB,CAAC,cAAc,GAAG,CAAC;QACvC,IAAI,cAAc,GAAG,iBAAiB,EAAE;YACpC,OAAO,CAAC,CAAC;SACZ;QAED,gCAAgC;QAChC,IAAI,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QAEzC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE;YACnC,YAAY,IAAI,IAAI,CAAC,gBAAgB,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;SAC7D;QAED,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,kBAAkB,CAAC,QAAgB,EAAE,YAAoB,EAAE,cAAc,GAAG,CAAC;QACjF,IAAI,QAAQ,IAAI,CAAC,IAAI,cAAc,GAAG,iBAAiB,EAAE;YACrD,OAAO,EAAE,CAAC;SACb;QAED,IAAI,UAAU,GAAa,EAAE,CAAC;QAC9B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE;YACvC,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YAC9E,IAAA,6BAAW,EAAC,UAAU,EAAE,QAAQ,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,YAAY,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC;YAE1G,+EAA+E;YAC/E,IAAI,UAAU,CAAC,MAAM,IAAI,YAAY,EAAE;gBACnC,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;gBAC/C,MAAM;aACT;SACJ;QAED,4DAA4D;QAC5D,0BAA0B;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAC9E,CAAC;CACJ;AArID,gDAqIC"}
+{"version":3,"file":"diagnostic.js","sourceRoot":"","sources":["../../../src/common/diagnostic.ts"],"names":[],"mappings":"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"}

package/dist/common/editAction.d.ts

@@ -32,4 +32,5 @@ export declare namespace TextEditAction {
 }
 export declare namespace FileEditAction {
     function is(value: any): value is FileEditAction;
+    function areEqual(e1: FileEditAction, e2: FileEditAction): boolean;
 }

package/dist/common/editAction.js

@@ -9,6 +9,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileEditAction = exports.TextEditAction = void 0;
+const textRange_1 = require("./textRange");
 var TextEditAction;
 (function (TextEditAction) {
     function is(value) {
@@ -22,5 +23,12 @@ var FileEditAction;
         return value.filePath !== undefined && TextEditAction.is(value);
     }
     FileEditAction.is = is;
+    function areEqual(e1, e2) {
+        return (e1 === e2 ||
+            (e1.filePath === e2.filePath &&
+                (0, textRange_1.rangesAreEqual)(e1.range, e2.range) &&
+                e1.replacementText === e2.replacementText));
+    }
+    FileEditAction.areEqual = areEqual;
 })(FileEditAction = exports.FileEditAction || (exports.FileEditAction = {}));
 //# sourceMappingURL=editAction.js.map

package/dist/common/editAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"editAction.js","sourceRoot":"","sources":["../../../src/common/editAction.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAwCH,IAAiB,cAAc,CAI9B;AAJD,WAAiB,cAAc;IAC3B,SAAgB,EAAE,CAAC,KAAU;QACzB,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,eAAe,KAAK,SAAS,CAAC;IAChE,CAAC;IAFe,iBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAI9B;AAED,IAAiB,cAAc,CAI9B;AAJD,WAAiB,cAAc;IAC3B,SAAgB,EAAE,CAAC,KAAU;QACzB,OAAO,KAAK,CAAC,QAAQ,KAAK,SAAS,IAAI,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;IAFe,iBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAI9B"}
+{"version":3,"file":"editAction.js","sourceRoot":"","sources":["../../../src/common/editAction.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,2CAAoD;AAsCpD,IAAiB,cAAc,CAI9B;AAJD,WAAiB,cAAc;IAC3B,SAAgB,EAAE,CAAC,KAAU;QACzB,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,eAAe,KAAK,SAAS,CAAC;IAChE,CAAC;IAFe,iBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAI9B;AAED,IAAiB,cAAc,CAa9B;AAbD,WAAiB,cAAc;IAC3B,SAAgB,EAAE,CAAC,KAAU;QACzB,OAAO,KAAK,CAAC,QAAQ,KAAK,SAAS,IAAI,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;IAFe,iBAAE,KAEjB,CAAA;IAED,SAAgB,QAAQ,CAAC,EAAkB,EAAE,EAAkB;QAC3D,OAAO,CACH,EAAE,KAAK,EAAE;YACT,CAAC,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,QAAQ;gBACxB,IAAA,0BAAc,EAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC;gBAClC,EAAE,CAAC,eAAe,KAAK,EAAE,CAAC,eAAe,CAAC,CACjD,CAAC;IACN,CAAC;IAPe,uBAAQ,WAOvB,CAAA;AACL,CAAC,EAbgB,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAa9B"}

package/dist/common/extensibility.d.ts

@@ -1,24 +1,43 @@
 import { CancellationToken, CodeAction, ExecuteCommandParams } from 'vscode-languageserver';
 import { Declaration } from '../analyzer/declaration';
-import { ParseTreeVisitor } from '../analyzer/parseTreeWalker';
+import { ImportResolver } from '../analyzer/importResolver';
 import { SourceFileInfo } from '../analyzer/program';
 import { SourceMapper } from '../analyzer/sourceMapper';
 import { TypeEvaluator } from '../analyzer/typeEvaluatorTypes';
 import { Type } from '../analyzer/types';
-import { WorkspaceServiceInstance } from '../languageServerBase';
+import { LanguageServerBase } from '../languageServerBase';
 import { CompletionOptions, CompletionResultsList } from '../languageService/completionProvider';
 import { FunctionNode, ParameterNode, ParseNode } from '../parser/parseNodes';
 import { ParseResults } from '../parser/parser';
-import { SignatureDisplayType } from './configOptions';
+import { ConfigOptions, SignatureDisplayType } from './configOptions';
+import { ConsoleInterface } from './console';
 import { Range } from './textRange';
 export interface LanguageServiceExtension {
-    readonly completionListExtension?: CompletionListExtension;
     readonly commandExtension?: CommandExtension;
+}
+export interface ProgramExtension {
+    readonly completionListExtension?: CompletionListExtension;
     readonly declarationProviderExtension?: DeclarationProviderExtension;
-    readonly nodeCheckerExtension?: NodeCheckerExtension;
     readonly typeProviderExtension?: TypeProviderExtension;
     readonly codeActionExtension?: CodeActionExtension;
-    sourceFileChanged?: (sourceFileInfo: SourceFileInfo) => void;
+    fileDirty?: (filePath: string) => void;
+    clearCache?: () => void;
+}
+export interface ProgramView {
+    readonly id: number;
+    rootPath: string;
+    getImportResolver(): ImportResolver;
+    console: ConsoleInterface;
+    getConfigOptions(): ConfigOptions;
+    owns(file: string): boolean;
+    getBoundSourceFileInfo(file: string, content?: string, force?: boolean): SourceFileInfo | undefined;
+}
+export interface ProgramMutator {
+    addInterimFile(file: string): void;
+}
+export interface ExtensionFactory {
+    createProgramExtension: (view: ProgramView, mutator: ProgramMutator) => ProgramExtension;
+    createLanguageServiceExtension: (languageserver: LanguageServerBase) => LanguageServiceExtension;
 }
 export interface CommandExtension {
     readonly commandPrefix: string;
@@ -35,15 +54,20 @@ export declare enum DeclarationUseCase {
 export interface DeclarationProviderExtension {
     tryGetDeclarations(node: ParseNode, useCase: DeclarationUseCase, token: CancellationToken): Declaration[];
 }
-export declare class NodeCheckerExtension extends ParseTreeVisitor<void> {
-}
 export interface TypeProviderExtension {
     tryGetParameterNodeType(node: ParameterNode, evaluator: TypeEvaluator, token: CancellationToken, context?: {}): Type | undefined;
     tryGetFunctionNodeType(node: FunctionNode, evaluator: TypeEvaluator, token: CancellationToken): Type | undefined;
 }
 export interface CodeActionExtension {
-    addCodeActions(workspace: WorkspaceServiceInstance, filePath: string, range: Range, parseResults: ParseResults, codeActions: CodeAction[], token: CancellationToken): void;
+    addCodeActions(filePath: string, range: Range, parseResults: ParseResults, codeActions: CodeAction[], token: CancellationToken): void;
+}
+export declare namespace Extensions {
+    function register(entries: ExtensionFactory[]): void;
+    function createProgramExtensions(view: ProgramView, mutator: ProgramMutator): void;
+    function destroyProgramExtensions(viewId: number): void;
+    function createLanguageServiceExtensions(languageServer: LanguageServerBase): void;
+    function destroyLanguageServiceExtensions(languageServer: LanguageServerBase): void;
+    function getProgramExtensions(nodeOrFilePath: ParseNode | string): ProgramExtension[];
+    function getLanguageServiceExtensions(): LanguageServiceExtension[];
+    function unregister(): void;
 }
-export declare function registerExtensions(extensions: LanguageServiceExtension[]): void;
-export declare function unregisterExtensions(): void;
-export declare function getExtensions(): LanguageServiceExtension[];

package/dist/common/extensibility.js

@@ -7,28 +7,73 @@
 * Language service extensibility.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExtensions = exports.unregisterExtensions = exports.registerExtensions = exports.NodeCheckerExtension = exports.DeclarationUseCase = void 0;
-const parseTreeWalker_1 = require("../analyzer/parseTreeWalker");
+exports.Extensions = exports.DeclarationUseCase = void 0;
+const analyzerNodeInfo_1 = require("../analyzer/analyzerNodeInfo");
 var DeclarationUseCase;
 (function (DeclarationUseCase) {
     DeclarationUseCase[DeclarationUseCase["Definition"] = 0] = "Definition";
     DeclarationUseCase[DeclarationUseCase["Rename"] = 1] = "Rename";
     DeclarationUseCase[DeclarationUseCase["References"] = 2] = "References";
 })(DeclarationUseCase = exports.DeclarationUseCase || (exports.DeclarationUseCase = {}));
-class NodeCheckerExtension extends parseTreeWalker_1.ParseTreeVisitor {
-}
-exports.NodeCheckerExtension = NodeCheckerExtension;
-const extensionList = [];
-function registerExtensions(extensions) {
-    extensionList.push(...extensions);
-}
-exports.registerExtensions = registerExtensions;
-function unregisterExtensions() {
-    extensionList.splice(0, extensionList.length);
-}
-exports.unregisterExtensions = unregisterExtensions;
-function getExtensions() {
-    return extensionList;
-}
-exports.getExtensions = getExtensions;
+var Extensions;
+(function (Extensions) {
+    const factories = [];
+    let programExtensions = [];
+    let languageServiceExtensions = [];
+    function register(entries) {
+        factories.push(...entries);
+    }
+    Extensions.register = register;
+    function createProgramExtensions(view, mutator) {
+        programExtensions.push(...factories
+            .map((s) => {
+            let result = s.createProgramExtension ? s.createProgramExtension(view, mutator) : undefined;
+            if (result) {
+                // Add the extra parameter that we use for finding later.
+                result = Object.defineProperty(result, 'view', { value: view });
+            }
+            return result;
+        })
+            .filter((s) => !!s));
+    }
+    Extensions.createProgramExtensions = createProgramExtensions;
+    function destroyProgramExtensions(viewId) {
+        programExtensions = programExtensions.filter((s) => s.view.id !== viewId);
+    }
+    Extensions.destroyProgramExtensions = destroyProgramExtensions;
+    function createLanguageServiceExtensions(languageServer) {
+        languageServiceExtensions.push(...factories
+            .map((s) => {
+            let result = s.createLanguageServiceExtension
+                ? s.createLanguageServiceExtension(languageServer)
+                : undefined;
+            if (result) {
+                // Add the extra parameter that we use for finding later.
+                result = Object.defineProperty(result, 'owner', { value: languageServer });
+            }
+            return result;
+        })
+            .filter((s) => !!s));
+    }
+    Extensions.createLanguageServiceExtensions = createLanguageServiceExtensions;
+    function destroyLanguageServiceExtensions(languageServer) {
+        languageServiceExtensions = languageServiceExtensions.filter((s) => s.owner !== languageServer);
+    }
+    Extensions.destroyLanguageServiceExtensions = destroyLanguageServiceExtensions;
+    function getProgramExtensions(nodeOrFilePath) {
+        const filePath = typeof nodeOrFilePath === 'string' ? nodeOrFilePath.toString() : (0, analyzerNodeInfo_1.getFileInfo)(nodeOrFilePath).filePath;
+        return programExtensions.filter((s) => { var _a; return (_a = s.view) === null || _a === void 0 ? void 0 : _a.owns(filePath); });
+    }
+    Extensions.getProgramExtensions = getProgramExtensions;
+    function getLanguageServiceExtensions() {
+        return languageServiceExtensions;
+    }
+    Extensions.getLanguageServiceExtensions = getLanguageServiceExtensions;
+    function unregister() {
+        programExtensions.splice(0, programExtensions.length);
+        languageServiceExtensions.splice(0, languageServiceExtensions.length);
+        factories.splice(0, factories.length);
+    }
+    Extensions.unregister = unregister;
+})(Extensions = exports.Extensions || (exports.Extensions = {}));
 //# sourceMappingURL=extensibility.js.map

package/dist/common/extensibility.js.map

@@ -1 +1 @@
-{"version":3,"file":"extensibility.js","sourceRoot":"","sources":["../../../src/common/extensibility.ts"],"names":[],"mappings":";AAAA;;;;;;EAME;;;AAKF,iEAA+D;AA6C/D,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC1B,uEAAU,CAAA;IACV,+DAAM,CAAA;IACN,uEAAU,CAAA;AACd,CAAC,EAJW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAI7B;AAMD,MAAa,oBAAqB,SAAQ,kCAAsB;CAAG;AAAnE,oDAAmE;AAuBnE,MAAM,aAAa,GAA+B,EAAE,CAAC;AAErD,SAAgB,kBAAkB,CAAC,UAAsC;IACrE,aAAa,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;AACtC,CAAC;AAFD,gDAEC;AAED,SAAgB,oBAAoB;IAChC,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;AAClD,CAAC;AAFD,oDAEC;AAED,SAAgB,aAAa;IACzB,OAAO,aAAa,CAAC;AACzB,CAAC;AAFD,sCAEC"}
+{"version":3,"file":"extensibility.js","sourceRoot":"","sources":["../../../src/common/extensibility.ts"],"names":[],"mappings":"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"}

package/dist/common/fileBasedCancellationUtils.d.ts

@@ -3,7 +3,6 @@ import { CancellationProvider } from './cancellationUtils';
 export declare function getCancellationStrategyFromArgv(argv: string[]): CancellationStrategy;
 export declare function disposeCancellationToken(token: CancellationToken): void;
 export declare function getCancellationTokenFromId(cancellationId: string): CancellationToken;
-export declare function getCancellationTokenId(token: CancellationToken): string | undefined;
 export declare class FileBasedCancellationProvider implements CancellationProvider {
     private _prefix;
     constructor(_prefix: string);

package/dist/common/fileBasedCancellationUtils.js

@@ -26,86 +26,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileBasedCancellationProvider = exports.getCancellationTokenId = exports.getCancellationTokenFromId = exports.disposeCancellationToken = exports.getCancellationStrategyFromArgv = void 0;
+exports.FileBasedCancellationProvider = exports.getCancellationTokenFromId = exports.disposeCancellationToken = exports.getCancellationStrategyFromArgv = void 0;
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const vscode_jsonrpc_1 = require("vscode-jsonrpc");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const cancellationUtils_1 = require("./cancellationUtils");
-class CancellationThrottle {
-    static shouldCheck() {
-        // Throttle cancellation checks to one every 5ms. This value
-        // was selected through empirical testing. If we call the
-        // file system more often than this, type analysis performance
-        // is affected. If we call it less often, performance doesn't
-        // improve much, but responsiveness suffers.
-        const minTimeBetweenChecksInMs = 5;
-        const curTimestamp = Date.now().valueOf();
-        const timeSinceLastCheck = curTimestamp - this._lastCheckTimestamp;
-        if (timeSinceLastCheck >= minTimeBetweenChecksInMs) {
-            this._lastCheckTimestamp = curTimestamp;
-            return true;
-        }
-        return false;
-    }
-}
-CancellationThrottle._lastCheckTimestamp = 0;
-class FileBasedToken {
-    constructor(cancellationFilePath) {
-        this.cancellationFilePath = cancellationFilePath;
-        this.isCancelled = false;
-    }
-    cancel() {
-        if (!this.isCancelled) {
-            this.isCancelled = true;
-            if (this._emitter) {
-                this._emitter.fire(undefined);
-                this._disposeEmitter();
-            }
-        }
-    }
-    get isCancellationRequested() {
-        if (this.isCancelled) {
-            return true;
-        }
-        if (CancellationThrottle.shouldCheck() && this._pipeExists()) {
-            // The first time it encounters the cancellation file, it will
-            // cancel itself and raise a cancellation event.
-            // In this mode, cancel() might not be called explicitly by
-            // jsonrpc layer.
-            this.cancel();
-        }
-        return this.isCancelled;
-    }
-    get onCancellationRequested() {
-        if (!this._emitter) {
-            this._emitter = new vscode_languageserver_1.Emitter();
-        }
-        return this._emitter.event;
-    }
-    dispose() {
-        this._disposeEmitter();
-    }
-    _disposeEmitter() {
-        if (this._emitter) {
-            this._emitter.dispose();
-            this._emitter = undefined;
-        }
-    }
-    _pipeExists() {
-        try {
-            fs.statSync(this.cancellationFilePath);
-            return true;
-        }
-        catch (e) {
-            return false;
-        }
-    }
-}
-class OwningFileToken extends FileBasedToken {
+class OwningFileToken extends cancellationUtils_1.FileBasedToken {
     constructor(cancellationFilePath) {
-        super(cancellationFilePath);
+        super(cancellationFilePath, fs);
         this._disposed = false;
     }
     cancel() {
@@ -151,7 +81,7 @@ class FileBasedCancellationTokenSource {
             // Be lazy and create the token only when actually needed.
             this._token = this._ownFile
                 ? new OwningFileToken(this._cancellationFilePath)
-                : new FileBasedToken(this._cancellationFilePath);
+                : new cancellationUtils_1.FileBasedToken(this._cancellationFilePath, fs);
         }
         return this._token;
     }
@@ -171,7 +101,7 @@ class FileBasedCancellationTokenSource {
             // Make sure to initialize with an empty token if we had none.
             this._token = vscode_languageserver_1.CancellationToken.None;
         }
-        else if (this._token instanceof FileBasedToken) {
+        else if (this._token instanceof cancellationUtils_1.FileBasedToken) {
             // Actually dispose.
             this._token.dispose();
         }
@@ -222,7 +152,7 @@ function getCancellationStrategyFromArgv(argv) {
 }
 exports.getCancellationStrategyFromArgv = getCancellationStrategyFromArgv;
 function disposeCancellationToken(token) {
-    if (token instanceof FileBasedToken) {
+    if (token instanceof cancellationUtils_1.FileBasedToken) {
         token.dispose();
     }
 }
@@ -231,13 +161,9 @@ function getCancellationTokenFromId(cancellationId) {
     if (!cancellationId) {
         return vscode_languageserver_1.CancellationToken.None;
     }
-    return new FileBasedToken(cancellationId);
+    return new cancellationUtils_1.FileBasedToken(cancellationId, fs);
 }
 exports.getCancellationTokenFromId = getCancellationTokenFromId;
-function getCancellationTokenId(token) {
-    return token instanceof FileBasedToken ? token.cancellationFilePath : undefined;
-}
-exports.getCancellationTokenId = getCancellationTokenId;
 let cancellationSourceId = 0;
 class FileBasedCancellationProvider {
     constructor(_prefix) {

package/dist/common/fileBasedCancellationUtils.js.map

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

package/dist/common/pathUtils.d.ts

@@ -9,6 +9,9 @@ export interface FileSpec {
 }
 export declare namespace FileSpec {
     function is(value: any): value is FileSpec;
+    function isInPath(path: string, paths: FileSpec[]): boolean;
+    function matchesIncludeFileRegex(filePath: string, isFile?: boolean): boolean;
+    function matchIncludeFileSpec(includeRegExp: RegExp, exclude: FileSpec[], filePath: string, isFile?: boolean): boolean;
 }
 export interface FileSystemEntries {
     files: string[];

package/dist/common/pathUtils.js

@@ -37,6 +37,7 @@ const crypto_1 = require("./crypto");
 const debug = __importStar(require("./debug"));
 const stringUtils_1 = require("./stringUtils");
 let _fsCaseSensitivity = undefined;
+const _includeFileRegex = /\.pyi?$/;
 var FileSpec;
 (function (FileSpec) {
     function is(value) {
@@ -44,6 +45,23 @@ var FileSpec;
         return candidate && !!candidate.wildcardRoot && !!candidate.regExp;
     }
     FileSpec.is = is;
+    function isInPath(path, paths) {
+        return !!paths.find((p) => p.regExp.test(path));
+    }
+    FileSpec.isInPath = isInPath;
+    function matchesIncludeFileRegex(filePath, isFile = true) {
+        return isFile ? _includeFileRegex.test(filePath) : true;
+    }
+    FileSpec.matchesIncludeFileRegex = matchesIncludeFileRegex;
+    function matchIncludeFileSpec(includeRegExp, exclude, filePath, isFile = true) {
+        if (includeRegExp.test(filePath)) {
+            if (!FileSpec.isInPath(filePath, exclude) && FileSpec.matchesIncludeFileRegex(filePath, isFile)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    FileSpec.matchIncludeFileSpec = matchIncludeFileSpec;
 })(FileSpec = exports.FileSpec || (exports.FileSpec = {}));
 function forEachAncestorDirectory(directory, callback) {
     while (true) {