@zzzen/pyright-internal 1.1.254 → 1.2.0-dev.2022-07-02

package/dist/workspaceMap.js

@@ -7,17 +7,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkspaceMap = void 0;
 const deferred_1 = require("./common/deferred");
+const languageServerBase_1 = require("./languageServerBase");
 class WorkspaceMap extends Map {
     constructor() {
         super(...arguments);
         this._defaultWorkspacePath = '<default>';
     }
-    getNonDefaultWorkspaces() {
+    hasMultipleWorkspaces(kind) {
+        if (this.size === 0 || this.size === 1) {
+            return false;
+        }
+        let count = 0;
+        for (const kv of this) {
+            if (!kind || kv[1].kind === kind) {
+                count++;
+            }
+            if (count > 1) {
+                return true;
+            }
+        }
+        return false;
+    }
+    getNonDefaultWorkspaces(kind) {
         const workspaces = [];
         this.forEach((workspace) => {
-            if (workspace.rootPath) {
-                workspaces.push(workspace);
+            if (!workspace.rootPath) {
+                return;
+            }
+            if (kind && workspace.kind !== kind) {
+                return;
             }
+            workspaces.push(workspace);
         });
         return workspaces;
     }
@@ -56,8 +76,10 @@ class WorkspaceMap extends Map {
                     rootPath: '',
                     rootUri: '',
                     serviceInstance: ls.createAnalyzerService(this._defaultWorkspacePath),
+                    kind: languageServerBase_1.WellKnownWorkspaceKinds.Default,
                     disableLanguageServices: false,
                     disableOrganizeImports: false,
+                    disableWorkspaceSymbol: false,
                     isInitialized: (0, deferred_1.createDeferred)(),
                     searchPathsToWatch: [],
                 };

package/dist/workspaceMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspaceMap.js","sourceRoot":"","sources":["../../src/workspaceMap.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,gDAAmD;AAGnD,MAAa,YAAa,SAAQ,GAAqC;IAAvE;;QACY,0BAAqB,GAAG,WAAW,CAAC;IAiEhD,CAAC;IA/DG,uBAAuB;QACnB,MAAM,UAAU,GAA+B,EAAE,CAAC;QAClD,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACvB,IAAI,SAAS,CAAC,QAAQ,EAAE;gBACpB,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC9B;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,mBAAmB,CAAC,EAAsB,EAAE,QAAgB;QACxD,IAAI,YAAgC,CAAC;QACrC,IAAI,YAAkD,CAAC;QAEvD,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACvB,IAAI,SAAS,CAAC,QAAQ,EAAE;gBACpB,8CAA8C;gBAC9C,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE;oBACzC,+DAA+D;oBAC/D,iEAAiE;oBACjE,2DAA2D;oBAC3D,iBAAiB;oBACjB,IAAI,YAAY,KAAK,SAAS,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;wBAC3E,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC;wBAClC,YAAY,GAAG,SAAS,CAAC;qBAC5B;iBACJ;aACJ;QACL,CAAC,CAAC,CAAC;QAEH,6DAA6D;QAC7D,6CAA6C;QAC7C,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,IAAI,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YAC5D,IAAI,CAAC,gBAAgB,EAAE;gBACnB,gDAAgD;gBAChD,MAAM,cAAc,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBACxC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC7B,OAAO,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAE,CAAC;iBACvC;gBAED,wDAAwD;gBACxD,qBAAqB;gBACrB,gBAAgB,GAAG;oBACf,aAAa,EAAE,EAAE;oBACjB,QAAQ,EAAE,EAAE;oBACZ,OAAO,EAAE,EAAE;oBACX,eAAe,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,CAAC,qBAAqB,CAAC;oBACrE,uBAAuB,EAAE,KAAK;oBAC9B,sBAAsB,EAAE,KAAK;oBAC7B,aAAa,EAAE,IAAA,yBAAc,GAAW;oBACxC,kBAAkB,EAAE,EAAE;iBACzB,CAAC;gBACF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;gBACvD,EAAE,CAAC,0BAA0B,CAAC,gBAAgB,CAAC,CAAC,YAAY,EAAE,CAAC;aAClE;YAED,OAAO,gBAAgB,CAAC;SAC3B;QAED,OAAO,YAAY,CAAC;IACxB,CAAC;CACJ;AAlED,oCAkEC"}
+{"version":3,"file":"workspaceMap.js","sourceRoot":"","sources":["../../src/workspaceMap.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,45 +1,46 @@
 {
-    "name": "@zzzen/pyright-internal",
-    "displayName": "pyright",
-    "description": "Type checker for the Python language",
-    "version": "1.1.254",
-    "license": "MIT",
-    "files": [
-        "dist"
-    ],
-    "scripts": {
-        "build": "tsc",
-        "clean": "shx rm -rf ./dist ./out",
-        "test": "jest --forceExit",
-        "test:coverage": "jest --forceExit --reporters=jest-junit --reporters=default --coverage --coverageReporters=cobertura --coverageReporters=html --coverageReporters=json"
-    },
-    "dependencies": {
-        "@iarna/toml": "2.2.5",
-        "@yarnpkg/fslib": "2.6.0",
-        "@yarnpkg/libzip": "2.2.2",
-        "chalk": "^4.1.2",
-        "chokidar": "^3.5.3",
-        "command-line-args": "^5.2.1",
-        "jsonc-parser": "^3.0.0",
-        "leven": "^3.1.0",
-        "source-map-support": "^0.5.21",
-        "tmp": "^0.2.1",
-        "typescript-char": "^0.0.0",
-        "vscode-jsonrpc": "8.0.2-next.1",
-        "vscode-languageserver": "8.0.2-next.4",
-        "vscode-languageserver-textdocument": "^1.0.5",
-        "vscode-languageserver-types": "3.17.2-next.2",
-        "vscode-uri": "^3.0.3"
-    },
-    "devDependencies": {
-        "@types/command-line-args": "^5.2.0",
-        "@types/jest": "^27.4.0",
-        "@types/node": "^17.0.14",
-        "@types/tmp": "^0.2.3",
-        "jest": "^27.4.7",
-        "jest-junit": "^13.0.0",
-        "shx": "^0.3.4",
-        "ts-jest": "^27.1.3",
-        "typescript": "~4.4.4"
-    }
-}
+  "name": "@zzzen/pyright-internal",
+  "displayName": "pyright",
+  "description": "Type checker for the Python language",
+  "version": "1.2.0-dev.2022-07-02",
+  "license": "MIT",
+  "private": false,
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "clean": "shx rm -rf ./dist ./out",
+    "test": "jest --forceExit",
+    "test:coverage": "jest --forceExit --reporters=jest-junit --reporters=default --coverage --coverageReporters=cobertura --coverageReporters=html --coverageReporters=json"
+  },
+  "dependencies": {
+    "@iarna/toml": "2.2.5",
+    "@yarnpkg/fslib": "2.6.2",
+    "@yarnpkg/libzip": "2.2.4",
+    "chalk": "^4.1.2",
+    "chokidar": "^3.5.3",
+    "command-line-args": "^5.2.1",
+    "jsonc-parser": "^3.0.0",
+    "leven": "^3.1.0",
+    "source-map-support": "^0.5.21",
+    "tmp": "^0.2.1",
+    "typescript-char": "^0.0.0",
+    "vscode-jsonrpc": "8.0.2-next.1",
+    "vscode-languageserver": "8.0.2-next.4",
+    "vscode-languageserver-textdocument": "^1.0.5",
+    "vscode-languageserver-types": "3.17.2-next.2",
+    "vscode-uri": "^3.0.3"
+  },
+  "devDependencies": {
+    "@types/command-line-args": "^5.2.0",
+    "@types/jest": "^27.5.2",
+    "@types/node": "^17.0.45",
+    "@types/tmp": "^0.2.3",
+    "jest": "^27.5.1",
+    "jest-junit": "^13.2.0",
+    "shx": "^0.3.4",
+    "ts-jest": "^27.1.5",
+    "typescript": "~4.4.4"
+  }
+}