@zzzen/pyright-internal 1.2.0-dev.20261018 → 1.2.0-dev.20261108
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/analyzer/binder.js +29 -12
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.js +4 -0
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.js +3 -3
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/constructorTransform.js +12 -0
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/constructors.d.ts +1 -1
- package/dist/analyzer/constructors.js +1 -1
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.js +14 -5
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/decorators.d.ts +2 -2
- package/dist/analyzer/decorators.js +22 -2
- package/dist/analyzer/decorators.js.map +1 -1
- package/dist/analyzer/functionTransform.d.ts +5 -0
- package/dist/analyzer/functionTransform.js +6 -3
- package/dist/analyzer/functionTransform.js.map +1 -1
- package/dist/analyzer/missingBindingMetadata.d.ts +6 -0
- package/dist/analyzer/missingBindingMetadata.js +22 -0
- package/dist/analyzer/missingBindingMetadata.js.map +1 -0
- package/dist/analyzer/namedTuples.d.ts +5 -1
- package/dist/analyzer/namedTuples.js +64 -35
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.js +45 -1
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +2 -0
- package/dist/analyzer/parseTreeUtils.js +43 -0
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.d.ts +5 -1
- package/dist/analyzer/patternMatching.js +6 -1
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +3 -0
- package/dist/analyzer/program.js +71 -1
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/sentinel.js +7 -1
- package/dist/analyzer/sentinel.js.map +1 -1
- package/dist/analyzer/sourceFile.js +13 -6
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/tupleComparison.d.ts +6 -0
- package/dist/analyzer/tupleComparison.js +731 -0
- package/dist/analyzer/tupleComparison.js.map +1 -0
- package/dist/analyzer/tuples.d.ts +1 -1
- package/dist/analyzer/tuples.js +35 -4
- package/dist/analyzer/tuples.js.map +1 -1
- package/dist/analyzer/typeCacheUtils.d.ts +1 -0
- package/dist/analyzer/typeCacheUtils.js +10 -0
- package/dist/analyzer/typeCacheUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator/boundMethodSpecialization.d.ts +15 -0
- package/dist/analyzer/typeEvaluator/boundMethodSpecialization.js +98 -0
- package/dist/analyzer/typeEvaluator/boundMethodSpecialization.js.map +1 -0
- package/dist/analyzer/typeEvaluator/classConstruction.d.ts +25 -0
- package/dist/analyzer/typeEvaluator/classConstruction.js +251 -0
- package/dist/analyzer/typeEvaluator/classConstruction.js.map +1 -0
- package/dist/analyzer/typeEvaluator/collectionInference.d.ts +41 -0
- package/dist/analyzer/typeEvaluator/collectionInference.js +695 -0
- package/dist/analyzer/typeEvaluator/collectionInference.js.map +1 -0
- package/dist/analyzer/typeEvaluator/diagnostics.d.ts +33 -0
- package/dist/analyzer/typeEvaluator/diagnostics.js +198 -0
- package/dist/analyzer/typeEvaluator/diagnostics.js.map +1 -0
- package/dist/analyzer/typeEvaluator/evaluatorCore.d.ts +80 -0
- package/dist/analyzer/typeEvaluator/evaluatorCore.js +1126 -0
- package/dist/analyzer/typeEvaluator/evaluatorCore.js.map +1 -0
- package/dist/analyzer/typeEvaluator/evaluatorNarrowing.d.ts +17 -0
- package/dist/analyzer/typeEvaluator/evaluatorNarrowing.js +370 -0
- package/dist/analyzer/typeEvaluator/evaluatorNarrowing.js.map +1 -0
- package/dist/analyzer/typeEvaluator/expressionEvaluation.d.ts +81 -0
- package/dist/analyzer/typeEvaluator/expressionEvaluation.js +1802 -0
- package/dist/analyzer/typeEvaluator/expressionEvaluation.js.map +1 -0
- package/dist/analyzer/typeEvaluator/flowAnalysis.d.ts +33 -0
- package/dist/analyzer/typeEvaluator/flowAnalysis.js +217 -0
- package/dist/analyzer/typeEvaluator/flowAnalysis.js.map +1 -0
- package/dist/analyzer/typeEvaluator/internals.d.ts +137 -0
- package/dist/analyzer/typeEvaluator/internals.js +10 -0
- package/dist/analyzer/typeEvaluator/internals.js.map +1 -0
- package/dist/analyzer/typeEvaluator/literalTypes.d.ts +3 -0
- package/dist/analyzer/typeEvaluator/literalTypes.js +52 -0
- package/dist/analyzer/typeEvaluator/literalTypes.js.map +1 -0
- package/dist/analyzer/typeEvaluator/memberResolution.d.ts +79 -0
- package/dist/analyzer/typeEvaluator/memberResolution.js +1007 -0
- package/dist/analyzer/typeEvaluator/memberResolution.js.map +1 -0
- package/dist/analyzer/typeEvaluator/overrideValidation.d.ts +15 -0
- package/dist/analyzer/typeEvaluator/overrideValidation.js +422 -0
- package/dist/analyzer/typeEvaluator/overrideValidation.js.map +1 -0
- package/dist/analyzer/typeEvaluator/returnTypeInference.d.ts +33 -0
- package/dist/analyzer/typeEvaluator/returnTypeInference.js +226 -0
- package/dist/analyzer/typeEvaluator/returnTypeInference.js.map +1 -0
- package/dist/analyzer/typeEvaluator/specialFormCreation.d.ts +39 -0
- package/dist/analyzer/typeEvaluator/specialFormCreation.js +1728 -0
- package/dist/analyzer/typeEvaluator/specialFormCreation.js.map +1 -0
- package/dist/analyzer/typeEvaluator/tupleUnpacking.d.ts +2 -0
- package/dist/analyzer/typeEvaluator/tupleUnpacking.js +36 -0
- package/dist/analyzer/typeEvaluator/tupleUnpacking.js.map +1 -0
- package/dist/analyzer/typeEvaluator/typeCompatibility.d.ts +36 -0
- package/dist/analyzer/typeEvaluator/typeCompatibility.js +1320 -0
- package/dist/analyzer/typeEvaluator/typeCompatibility.js.map +1 -0
- package/dist/analyzer/typeEvaluator/typeGuardNarrowing.d.ts +186 -0
- package/dist/analyzer/typeEvaluator/typeGuardNarrowing.js +1683 -0
- package/dist/analyzer/typeEvaluator/typeGuardNarrowing.js.map +1 -0
- package/dist/analyzer/typeEvaluator/typeVarHandling.d.ts +48 -0
- package/dist/analyzer/typeEvaluator/typeVarHandling.js +756 -0
- package/dist/analyzer/typeEvaluator/typeVarHandling.js.map +1 -0
- package/dist/analyzer/typeEvaluator.d.ts +3 -31
- package/dist/analyzer/typeEvaluator.js +5140 -13656
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +1 -1
- package/dist/analyzer/typeEvaluatorTypes.js +2 -3
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.d.ts +3 -2
- package/dist/analyzer/typeGuards.js +236 -1375
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeUtils.js +9 -2
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.js +111 -0
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +14 -0
- package/dist/analyzer/types.js +215 -10
- package/dist/analyzer/types.js.map +1 -1
- package/dist/browser/browserConnection.d.ts +12 -0
- package/dist/browser/browserConnection.js +23 -0
- package/dist/browser/browserConnection.js.map +1 -0
- package/dist/browser/browserFileSystem.d.ts +73 -0
- package/dist/browser/browserFileSystem.js +578 -0
- package/dist/browser/browserFileSystem.js.map +1 -0
- package/dist/browser/browserHost.d.ts +4 -0
- package/dist/browser/browserHost.js +10 -0
- package/dist/browser/browserHost.js.map +1 -0
- package/dist/browser/browserProcess.d.ts +1 -0
- package/dist/browser/browserProcess.js +17 -0
- package/dist/browser/browserProcess.js.map +1 -0
- package/dist/browser/browserServer.d.ts +8 -0
- package/dist/browser/browserServer.js +32 -0
- package/dist/browser/browserServer.js.map +1 -0
- package/dist/browser/cancellation/common.d.ts +10 -0
- package/dist/browser/cancellation/common.js +114 -0
- package/dist/browser/cancellation/common.js.map +1 -0
- package/dist/browser/cancellation/objectURLReceiverStrategy.d.ts +5 -0
- package/dist/browser/cancellation/objectURLReceiverStrategy.js +37 -0
- package/dist/browser/cancellation/objectURLReceiverStrategy.js.map +1 -0
- package/dist/browser/cancellation/objectURLSenderStrategy.d.ts +7 -0
- package/dist/browser/cancellation/objectURLSenderStrategy.js +32 -0
- package/dist/browser/cancellation/objectURLSenderStrategy.js.map +1 -0
- package/dist/browser/worker.d.ts +1 -0
- package/dist/browser/worker.js +33 -0
- package/dist/browser/worker.js.map +1 -0
- package/dist/common/processUtils.d.ts +6 -0
- package/dist/common/processUtils.js +56 -1
- package/dist/common/processUtils.js.map +1 -1
- package/dist/common/textEditTracker.js +1 -1
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/windowsProcessTree.d.ts +2 -0
- package/dist/common/windowsProcessTree.js +23 -0
- package/dist/common/windowsProcessTree.js.map +1 -1
- package/dist/common/windowsProcessTree.json +23 -3
- package/dist/languageServerBase.d.ts +3 -0
- package/dist/languageServerBase.js +44 -12
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +6 -6
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/referencesProvider.js +3 -3
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/renameProvider.js +1 -1
- package/dist/languageService/renameProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.js +2 -2
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/localization/localize.d.ts +2 -0
- package/dist/localization/localize.js +2 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.en-us.json +8 -0
- package/dist/parser/parseTreeTokenReuse.d.ts +34 -0
- package/dist/parser/parseTreeTokenReuse.js +897 -0
- package/dist/parser/parseTreeTokenReuse.js.map +1 -0
- package/dist/parser/tokenizer.d.ts +10 -1
- package/dist/parser/tokenizer.js +184 -130
- package/dist/parser/tokenizer.js.map +1 -1
- package/dist/pyrightServer.d.ts +34 -0
- package/dist/pyrightServer.js +239 -0
- package/dist/pyrightServer.js.map +1 -0
- package/dist/server.d.ts +3 -23
- package/dist/server.js +12 -232
- package/dist/server.js.map +1 -1
- package/dist/tests/benchmarks/typeInferenceComparison.d.ts +1 -0
- package/dist/tests/benchmarks/typeInferenceComparison.js +1235 -0
- package/dist/tests/benchmarks/typeInferenceComparison.js.map +1 -0
- package/dist/tests/benchmarks/typeInferencePyrightEntry.d.ts +1 -0
- package/dist/tests/benchmarks/typeInferencePyrightEntry.js +53 -0
- package/dist/tests/benchmarks/typeInferencePyrightEntry.js.map +1 -0
- package/dist/tests/browserCancellation.test.d.ts +1 -0
- package/dist/tests/browserCancellation.test.js +63 -0
- package/dist/tests/browserCancellation.test.js.map +1 -0
- package/dist/tests/browserServer.test.d.ts +1 -0
- package/dist/tests/browserServer.test.js +177 -0
- package/dist/tests/browserServer.test.js.map +1 -0
- package/dist/tests/checker.test.js +8 -0
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/constraintSolver.test.js +45 -0
- package/dist/tests/constraintSolver.test.js.map +1 -1
- package/dist/tests/fourSlashParser.test.js +35 -0
- package/dist/tests/fourSlashParser.test.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js +14 -4
- package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
- package/dist/tests/languageServer.test.js +15 -0
- package/dist/tests/languageServer.test.js.map +1 -1
- package/dist/tests/lsp/languageServer.js +6 -6
- package/dist/tests/lsp/languageServer.js.map +1 -1
- package/dist/tests/mypyPrimerAnalysis.test.js +148 -1
- package/dist/tests/mypyPrimerAnalysis.test.js.map +1 -1
- package/dist/tests/typeCacheUtils.test.js +46 -0
- package/dist/tests/typeCacheUtils.test.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +78 -1
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +54 -1
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +4 -0
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +42 -3
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator6.test.js +35 -0
- package/dist/tests/typeEvaluator6.test.js.map +1 -1
- package/dist/tests/typeEvaluator7.test.js +414 -0
- package/dist/tests/typeEvaluator7.test.js.map +1 -1
- package/dist/tests/typeEvaluator8.test.js +1291 -1
- package/dist/tests/typeEvaluator8.test.js.map +1 -1
- package/dist/tests/typeUtils.test.js +28 -0
- package/dist/tests/typeUtils.test.js.map +1 -1
- package/dist/tests/types.test.js +55 -0
- package/dist/tests/types.test.js.map +1 -1
- package/dist/typeServer/programWrapper.js +8 -2
- package/dist/typeServer/programWrapper.js.map +1 -1
- package/dist/typeServer/server.d.ts +12 -2
- package/dist/typeServer/server.js +97 -0
- package/dist/typeServer/server.js.map +1 -1
- package/dist/typeServer/stubGenerator.js +136 -3
- package/dist/typeServer/stubGenerator.js.map +1 -1
- package/dist/typeServer/typeServerConversionUtils.js +13 -0
- package/dist/typeServer/typeServerConversionUtils.js.map +1 -1
- package/package.json +3 -1
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.BrowserPyrightServer = void 0;
|
|
4
|
+
const cacheManager_1 = require("../analyzer/cacheManager");
|
|
5
|
+
const console_1 = require("../common/console");
|
|
6
|
+
const fileWatcher_1 = require("../common/fileWatcher");
|
|
7
|
+
const host_1 = require("../common/host");
|
|
8
|
+
const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
|
|
9
|
+
const uri_1 = require("../common/uri/uri");
|
|
10
|
+
const pyrightFileSystem_1 = require("../pyrightFileSystem");
|
|
11
|
+
const pyrightServer_1 = require("../pyrightServer");
|
|
12
|
+
const browserHost_1 = require("./browserHost");
|
|
13
|
+
class BrowserPyrightServer extends pyrightServer_1.PyrightServerBase {
|
|
14
|
+
constructor(connection, fileSystem) {
|
|
15
|
+
const services = (0, serviceProviderExtensions_1.createServiceProvider)(new pyrightFileSystem_1.PyrightFileSystem(fileSystem), new browserHost_1.BrowserCaseSensitivityDetector(), new console_1.ConsoleWithLogLevel(connection.console), new cacheManager_1.CacheManager());
|
|
16
|
+
super(connection, {
|
|
17
|
+
rootDirectory: uri_1.Uri.file('/', services),
|
|
18
|
+
serviceProvider: services,
|
|
19
|
+
fileWatcherHandler: fileWatcher_1.nullFileWatcherHandler,
|
|
20
|
+
createHost: () => new host_1.NoAccessHost(),
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
async getSettings(workspace) {
|
|
24
|
+
const settings = await super.getSettings(workspace);
|
|
25
|
+
settings.watchForSourceChanges = false;
|
|
26
|
+
settings.watchForLibraryChanges = false;
|
|
27
|
+
settings.watchForConfigChanges = false;
|
|
28
|
+
return settings;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
exports.BrowserPyrightServer = BrowserPyrightServer;
|
|
32
|
+
//# sourceMappingURL=browserServer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browserServer.js","sourceRoot":"","sources":["../../../../../src/browser/browserServer.ts"],"names":[],"mappings":";;;AAEA,2DAAwD;AACxD,+CAAwD;AACxD,uDAA+D;AAC/D,yCAA8C;AAC9C,mFAA4E;AAC5E,2CAAwC;AACxC,4DAAyD;AACzD,oDAAqD;AAGrD,+CAA+D;AAE/D,MAAa,oBAAqB,SAAQ,iCAAiB;IACvD,YAAY,UAAsB,EAAE,UAA6B;QAC7D,MAAM,QAAQ,GAAG,IAAA,iDAAqB,EAClC,IAAI,qCAAiB,CAAC,UAAU,CAAC,EACjC,IAAI,4CAA8B,EAAE,EACpC,IAAI,6BAAmB,CAAC,UAAU,CAAC,OAAO,CAAC,EAC3C,IAAI,2BAAY,EAAE,CACrB,CAAC;QACF,KAAK,CAAC,UAAU,EAAE;YACd,aAAa,EAAE,SAAG,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC;YACtC,eAAe,EAAE,QAAQ;YACzB,kBAAkB,EAAE,oCAAsB;YAC1C,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,mBAAY,EAAE;SACvC,CAAC,CAAC;IACP,CAAC;IAEQ,KAAK,CAAC,WAAW,CAAC,SAAoB;QAC3C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QACpD,QAAQ,CAAC,qBAAqB,GAAG,KAAK,CAAC;QACvC,QAAQ,CAAC,sBAAsB,GAAG,KAAK,CAAC;QACxC,QAAQ,CAAC,qBAAqB,GAAG,KAAK,CAAC;QACvC,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ;AAvBD,oDAuBC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import * as rpc from 'vscode-jsonrpc';
|
|
2
|
+
export declare class ReceiverTokenSource implements rpc.AbstractCancellationTokenSource {
|
|
3
|
+
private _isCancellationRequested;
|
|
4
|
+
private _id;
|
|
5
|
+
private _token?;
|
|
6
|
+
constructor(_isCancellationRequested: (id: rpc.CancellationId) => boolean, _id: rpc.CancellationId);
|
|
7
|
+
get token(): rpc.CancellationToken;
|
|
8
|
+
cancel(): void;
|
|
9
|
+
dispose(): void;
|
|
10
|
+
}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.ReceiverTokenSource = void 0;
|
|
37
|
+
const rpc = __importStar(require("vscode-jsonrpc"));
|
|
38
|
+
const cancellationUtils_1 = require("../../common/cancellationUtils");
|
|
39
|
+
// For the below, see: https://github.com/microsoft/vscode-languageserver-node/blob/dca3c1a04797aaaa7d48060cca38b16efdf4392f/jsonrpc/src/common/cancellation.ts
|
|
40
|
+
const shortcutEvent = Object.freeze(function (callback, context) {
|
|
41
|
+
const handle = setTimeout(callback.bind(context), 0);
|
|
42
|
+
return {
|
|
43
|
+
dispose() {
|
|
44
|
+
clearTimeout(handle);
|
|
45
|
+
},
|
|
46
|
+
};
|
|
47
|
+
});
|
|
48
|
+
class Token {
|
|
49
|
+
constructor(_isCancellationRequested, _id) {
|
|
50
|
+
this._isCancellationRequested = _isCancellationRequested;
|
|
51
|
+
this._id = _id;
|
|
52
|
+
this._isCanceled = false;
|
|
53
|
+
}
|
|
54
|
+
get isCancellationRequested() {
|
|
55
|
+
if (this._isCanceled) {
|
|
56
|
+
return true;
|
|
57
|
+
}
|
|
58
|
+
if (cancellationUtils_1.CancellationThrottle.shouldCheck() && this._isCancellationRequested(this._id)) {
|
|
59
|
+
return (this._isCanceled = true);
|
|
60
|
+
}
|
|
61
|
+
return false;
|
|
62
|
+
}
|
|
63
|
+
get onCancellationRequested() {
|
|
64
|
+
if (this._isCanceled) {
|
|
65
|
+
return shortcutEvent;
|
|
66
|
+
}
|
|
67
|
+
if (!this._emitter) {
|
|
68
|
+
this._emitter = new rpc.Emitter();
|
|
69
|
+
}
|
|
70
|
+
return this._emitter.event;
|
|
71
|
+
}
|
|
72
|
+
cancel() {
|
|
73
|
+
if (!this._isCanceled) {
|
|
74
|
+
this._isCanceled = true;
|
|
75
|
+
if (this._emitter) {
|
|
76
|
+
this._emitter.fire(undefined);
|
|
77
|
+
this.dispose();
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
dispose() {
|
|
82
|
+
if (this._emitter) {
|
|
83
|
+
this._emitter.dispose();
|
|
84
|
+
this._emitter = undefined;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
class ReceiverTokenSource {
|
|
89
|
+
constructor(_isCancellationRequested, _id) {
|
|
90
|
+
this._isCancellationRequested = _isCancellationRequested;
|
|
91
|
+
this._id = _id;
|
|
92
|
+
}
|
|
93
|
+
get token() {
|
|
94
|
+
return (this._token ?? (this._token = new Token(this._isCancellationRequested, this._id)));
|
|
95
|
+
}
|
|
96
|
+
cancel() {
|
|
97
|
+
if (this._token instanceof Token) {
|
|
98
|
+
this._token.cancel();
|
|
99
|
+
}
|
|
100
|
+
else if (!this._token) {
|
|
101
|
+
this._token = rpc.CancellationToken.Cancelled;
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
dispose() {
|
|
105
|
+
if (this._token instanceof Token) {
|
|
106
|
+
this._token.dispose();
|
|
107
|
+
}
|
|
108
|
+
else if (!this._token) {
|
|
109
|
+
this._token = rpc.CancellationToken.None;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
exports.ReceiverTokenSource = ReceiverTokenSource;
|
|
114
|
+
//# sourceMappingURL=common.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../../src/browser/cancellation/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// objectURLReceiverStrategy.ts
|
|
3
|
+
//
|
|
4
|
+
// Based on this here (MIT licensed):
|
|
5
|
+
// https://github.com/panstromek/zebra-rs/blob/82d616225930b3ad423a2c6d883c79b94ee08ba6/webzebra/src/objectURL.ts
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.ObjectURLReceiverStrategy = void 0;
|
|
8
|
+
const common_1 = require("./common");
|
|
9
|
+
function isCancellationRequested(requestMessage, id) {
|
|
10
|
+
const objectURL = requestMessage.$objectURL;
|
|
11
|
+
// Other side may have not added the object URL to the request.
|
|
12
|
+
if (!objectURL) {
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
const request = new XMLHttpRequest();
|
|
16
|
+
request.open('GET', objectURL, /* async */ false);
|
|
17
|
+
try {
|
|
18
|
+
request.send(null);
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
return true;
|
|
22
|
+
}
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
// See this issue for why the implements is commented out:
|
|
26
|
+
// https://github.com/microsoft/vscode-languageserver-node/issues/1425
|
|
27
|
+
class ObjectURLReceiverStrategy {
|
|
28
|
+
constructor() {
|
|
29
|
+
// implements rpc.RequestCancellationReceiverStrategy {
|
|
30
|
+
this.kind = 'request';
|
|
31
|
+
}
|
|
32
|
+
createCancellationTokenSource(requestMessage) {
|
|
33
|
+
return new common_1.ReceiverTokenSource(isCancellationRequested.bind(undefined, requestMessage), requestMessage.id?.toString() || '');
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
exports.ObjectURLReceiverStrategy = ObjectURLReceiverStrategy;
|
|
37
|
+
//# sourceMappingURL=objectURLReceiverStrategy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"objectURLReceiverStrategy.js","sourceRoot":"","sources":["../../../../../../src/browser/cancellation/objectURLReceiverStrategy.ts"],"names":[],"mappings":";AAAA,+BAA+B;AAC/B,EAAE;AACF,qCAAqC;AACrC,iHAAiH;;;AAIjH,qCAA+C;AAE/C,SAAS,uBAAuB,CAAC,cAAkC,EAAE,EAAsB;IACvF,MAAM,SAAS,GAAI,cAAsB,CAAC,UAAU,CAAC;IAErD,+DAA+D;IAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;IACrC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;IAClD,IAAI,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,0DAA0D;AAC1D,sEAAsE;AACtE,MAAa,yBAAyB;IAAtC;QACI,uDAAuD;QAC9C,SAAI,GAAG,SAAkB,CAAC;IAOvC,CAAC;IANG,6BAA6B,CAAC,cAAkC;QAC5D,OAAO,IAAI,4BAAmB,CAC1B,uBAAuB,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,EACvD,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CACtC,CAAC;IACN,CAAC;CACJ;AATD,8DASC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import * as rpc from 'vscode-jsonrpc';
|
|
2
|
+
export declare class ObjectURLSenderStrategy implements rpc.CancellationSenderStrategy {
|
|
3
|
+
private _map;
|
|
4
|
+
enableCancellation(request: rpc.RequestMessage): void;
|
|
5
|
+
cleanup(id: rpc.CancellationId): void;
|
|
6
|
+
sendCancellation(_conn: rpc.MessageConnection, id: rpc.CancellationId): Promise<void>;
|
|
7
|
+
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// objectURLSenderStrategy.ts
|
|
3
|
+
//
|
|
4
|
+
// Based on this here (MIT licensed):
|
|
5
|
+
// https://github.com/panstromek/zebra-rs/blob/82d616225930b3ad423a2c6d883c79b94ee08ba6/webzebra/src/objectURL.ts
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.ObjectURLSenderStrategy = void 0;
|
|
8
|
+
class ObjectURLSenderStrategy {
|
|
9
|
+
constructor() {
|
|
10
|
+
this._map = new Map();
|
|
11
|
+
}
|
|
12
|
+
enableCancellation(request) {
|
|
13
|
+
// Create the object URL and add its value to the request
|
|
14
|
+
const objectURL = URL.createObjectURL(new Blob());
|
|
15
|
+
request.$objectURL = objectURL;
|
|
16
|
+
this._map.set(request.id, objectURL);
|
|
17
|
+
}
|
|
18
|
+
cleanup(id) {
|
|
19
|
+
const objectURL = this._map.get(id);
|
|
20
|
+
if (objectURL) {
|
|
21
|
+
URL.revokeObjectURL(objectURL);
|
|
22
|
+
this._map.delete(id);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
sendCancellation(_conn, id) {
|
|
26
|
+
// Just revoke the object URL
|
|
27
|
+
this.cleanup(id);
|
|
28
|
+
return Promise.resolve();
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
exports.ObjectURLSenderStrategy = ObjectURLSenderStrategy;
|
|
32
|
+
//# sourceMappingURL=objectURLSenderStrategy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"objectURLSenderStrategy.js","sourceRoot":"","sources":["../../../../../../src/browser/cancellation/objectURLSenderStrategy.ts"],"names":[],"mappings":";AAAA,6BAA6B;AAC7B,EAAE;AACF,qCAAqC;AACrC,iHAAiH;;;AAIjH,MAAa,uBAAuB;IAApC;QACY,SAAI,GAAG,IAAI,GAAG,EAAkC,CAAC;IAmB7D,CAAC;IAlBG,kBAAkB,CAAC,OAA2B;QAC1C,yDAAyD;QACzD,MAAM,SAAS,GAAG,GAAG,CAAC,eAAe,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACjD,OAAe,CAAC,UAAU,GAAG,SAAS,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,CAAC,EAAsB;QAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,SAAS,EAAE,CAAC;YACZ,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzB,CAAC;IACL,CAAC;IACD,gBAAgB,CAAC,KAA4B,EAAE,EAAsB;QACjE,6BAA6B;QAC7B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACjB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ;AApBD,0DAoBC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/// <reference lib="webworker" />
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
const tomlUtils_1 = require("../common/tomlUtils");
|
|
5
|
+
const uriUtils_1 = require("../common/uri/uriUtils");
|
|
6
|
+
const browserConnection_1 = require("./browserConnection");
|
|
7
|
+
const browserFileSystem_1 = require("./browserFileSystem");
|
|
8
|
+
const browserServer_1 = require("./browserServer");
|
|
9
|
+
async function main() {
|
|
10
|
+
await (0, tomlUtils_1.ensureTomlModuleLoaded)();
|
|
11
|
+
const connection = (0, browserConnection_1.createBrowserConnection)(self, 'url');
|
|
12
|
+
const distUrl = new URL('./', self.location.href).toString();
|
|
13
|
+
let isReady = false;
|
|
14
|
+
const fileSystem = new browserFileSystem_1.BrowserFileSystem('/', [distUrl], [], {
|
|
15
|
+
onReadError: (error) => {
|
|
16
|
+
if (isReady) {
|
|
17
|
+
void connection.sendNotification('pyright/assetLoadFailed', { message: error.message });
|
|
18
|
+
}
|
|
19
|
+
},
|
|
20
|
+
throwOnReadError: true,
|
|
21
|
+
});
|
|
22
|
+
if (!fileSystem.readFileSync(uriUtils_1.UriEx.file('/typeshed-fallback/stdlib/builtins.pyi'), 'utf8')) {
|
|
23
|
+
throw new Error('The browser distribution is missing builtins.pyi');
|
|
24
|
+
}
|
|
25
|
+
new browserServer_1.BrowserPyrightServer(connection, fileSystem);
|
|
26
|
+
await connection.sendNotification('pyright/ready');
|
|
27
|
+
isReady = true;
|
|
28
|
+
}
|
|
29
|
+
void main().catch((error) => {
|
|
30
|
+
console.error('Unable to start Pyright browser worker', error);
|
|
31
|
+
self.postMessage({ jsonrpc: '2.0', method: 'pyright/startupFailed', params: { message: String(error) } });
|
|
32
|
+
});
|
|
33
|
+
//# sourceMappingURL=worker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../../../../src/browser/worker.ts"],"names":[],"mappings":";AAAA,iCAAiC;;AAEjC,mDAA6D;AAC7D,qDAA+C;AAC/C,2DAA8D;AAC9D,2DAAwD;AACxD,mDAAuD;AAIvD,KAAK,UAAU,IAAI;IACf,MAAM,IAAA,kCAAsB,GAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,IAAA,2CAAuB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7D,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,UAAU,GAAG,IAAI,qCAAiB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE;QACzD,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;YACnB,IAAI,OAAO,EAAE,CAAC;gBACV,KAAK,UAAU,CAAC,gBAAgB,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5F,CAAC;QACL,CAAC;QACD,gBAAgB,EAAE,IAAI;KACzB,CAAC,CAAC;IACH,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,gBAAK,CAAC,IAAI,CAAC,wCAAwC,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC;QACzF,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,oCAAoB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IACjD,MAAM,UAAU,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;IACnD,OAAO,GAAG,IAAI,CAAC;AACnB,CAAC;AAED,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;IACjC,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;IAC/D,IAAI,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,uBAAuB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;AAC9G,CAAC,CAAC,CAAC"}
|
|
@@ -7,6 +7,12 @@ export declare function terminateChild(child: {
|
|
|
7
7
|
readonly signalCode?: string | null;
|
|
8
8
|
kill?(signal?: NodeJS.Signals | number): void;
|
|
9
9
|
}, signal?: NodeJS.Signals): void;
|
|
10
|
+
export declare function terminateChildren(children: readonly child_process.ChildProcess[], signal?: NodeJS.Signals): void;
|
|
11
|
+
export declare class ProcessTreeBatchTerminationError extends Error {
|
|
12
|
+
readonly children: readonly child_process.ChildProcess[];
|
|
13
|
+
readonly errors: readonly unknown[];
|
|
14
|
+
constructor(children: readonly child_process.ChildProcess[], errors: readonly unknown[]);
|
|
15
|
+
}
|
|
10
16
|
export declare class ProcessTreeTerminationError extends Error {
|
|
11
17
|
readonly child: child_process.ChildProcess;
|
|
12
18
|
constructor(child: child_process.ChildProcess, error: unknown);
|
|
@@ -33,9 +33,10 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.ProcessTreeTerminationError = void 0;
|
|
36
|
+
exports.ProcessTreeTerminationError = exports.ProcessTreeBatchTerminationError = void 0;
|
|
37
37
|
exports.terminateProcessTree = terminateProcessTree;
|
|
38
38
|
exports.terminateChild = terminateChild;
|
|
39
|
+
exports.terminateChildren = terminateChildren;
|
|
39
40
|
/*
|
|
40
41
|
* processUtils.ts
|
|
41
42
|
* Copyright (c) Microsoft Corporation.
|
|
@@ -103,6 +104,60 @@ function terminateChild(child, signal = 'SIGTERM') {
|
|
|
103
104
|
// Ignore.
|
|
104
105
|
}
|
|
105
106
|
}
|
|
107
|
+
function terminateChildren(children, signal = 'SIGTERM') {
|
|
108
|
+
if (process.platform !== 'win32') {
|
|
109
|
+
const retained = [...new Set(children)];
|
|
110
|
+
const errors = [];
|
|
111
|
+
for (const child of retained) {
|
|
112
|
+
try {
|
|
113
|
+
terminateChild(child, signal);
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
errors.push(error);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
if (errors.length) {
|
|
120
|
+
throw new ProcessTreeBatchTerminationError(retained, errors);
|
|
121
|
+
}
|
|
122
|
+
return;
|
|
123
|
+
}
|
|
124
|
+
const owned = [...new Set(children)].filter((child) => child instanceof child_process.ChildProcess &&
|
|
125
|
+
child.pid &&
|
|
126
|
+
Number.isSafeInteger(child.pid) &&
|
|
127
|
+
child.pid > 0 &&
|
|
128
|
+
child.exitCode === null &&
|
|
129
|
+
!child.signalCode &&
|
|
130
|
+
Reflect.get(child, '_handle'));
|
|
131
|
+
if (owned.length < 2) {
|
|
132
|
+
for (const child of owned) {
|
|
133
|
+
terminateChild(child, signal);
|
|
134
|
+
}
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
try {
|
|
138
|
+
child_process.execFileSync('powershell.exe', windowsProcessTree_1.windowsProcessTreePowerShellArgs, {
|
|
139
|
+
input: (0, windowsProcessTree_1.getWindowsProcessTreeBatchTerminationScript)(owned.map((child) => child.pid)),
|
|
140
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
141
|
+
windowsHide: true,
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
catch (error) {
|
|
145
|
+
throw new ProcessTreeBatchTerminationError(owned, [error]);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
class ProcessTreeBatchTerminationError extends Error {
|
|
149
|
+
constructor(children, errors) {
|
|
150
|
+
super(`Owned process-tree batch cleanup is incomplete: ${errors
|
|
151
|
+
.map((error) => (error instanceof Error ? error.message : String(error)))
|
|
152
|
+
.join('\n')}`);
|
|
153
|
+
this.children = children;
|
|
154
|
+
this.errors = errors;
|
|
155
|
+
this.name = 'ProcessTreeBatchTerminationError';
|
|
156
|
+
Object.defineProperty(this, 'children', { enumerable: false });
|
|
157
|
+
Object.defineProperty(this, 'errors', { enumerable: false });
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
exports.ProcessTreeBatchTerminationError = ProcessTreeBatchTerminationError;
|
|
106
161
|
class ProcessTreeTerminationError extends Error {
|
|
107
162
|
constructor(child, error) {
|
|
108
163
|
super(`Owned process-tree cleanup is incomplete for PID ${child.pid}: ${error instanceof Error ? error.message : String(error)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processUtils.js","sourceRoot":"","sources":["../../../../../src/common/processUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"processUtils.js","sourceRoot":"","sources":["../../../../../src/common/processUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -157,7 +157,7 @@ class TextEditTracker {
|
|
|
157
157
|
// See whether we have existing from import statement for the same module
|
|
158
158
|
// ex) from [|moduleName|] import subModule
|
|
159
159
|
const imported = importStatements.orderedImports.find((i) => i.node.nodeType === 25 /* ParseNodeType.ImportFrom */ &&
|
|
160
|
-
|
|
160
|
+
i.moduleName === (moduleNameInfo.nameForImportFrom ?? moduleNameInfo.name));
|
|
161
161
|
if (!imported || imported.node.nodeType !== 25 /* ParseNodeType.ImportFrom */ || imported.node.d.isWildcardImport) {
|
|
162
162
|
return false;
|
|
163
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textEditTracker.js","sourceRoot":"","sources":["../../../../../src/common/textEditTracker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"textEditTracker.js","sourceRoot":"","sources":["../../../../../src/common/textEditTracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,3 +2,5 @@ export declare const windowsProcessTreeScript: string;
|
|
|
2
2
|
export declare const windowsProcessTreePowerShellArgs: string[];
|
|
3
3
|
/** The caller must retain the actual spawned child's native handle throughout this synchronous script. */
|
|
4
4
|
export declare function getWindowsProcessTreeTerminationScript(pid: number): string;
|
|
5
|
+
/** Retain every spawned child's native handle until this synchronous batch completes. */
|
|
6
|
+
export declare function getWindowsProcessTreeBatchTerminationScript(pids: readonly number[]): string;
|
|
@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.windowsProcessTreePowerShellArgs = exports.windowsProcessTreeScript = void 0;
|
|
14
14
|
exports.getWindowsProcessTreeTerminationScript = getWindowsProcessTreeTerminationScript;
|
|
15
|
+
exports.getWindowsProcessTreeBatchTerminationScript = getWindowsProcessTreeBatchTerminationScript;
|
|
15
16
|
const windowsProcessTree_json_1 = __importDefault(require("./windowsProcessTree.json"));
|
|
16
17
|
// Keep the native implementation in a language-neutral asset so automation and
|
|
17
18
|
// restored-process owners can use the same selection rules, not another /T wrapper.
|
|
@@ -44,4 +45,26 @@ function getWindowsProcessTreeTerminationScript(pid) {
|
|
|
44
45
|
'try { Stop-OwnedWindowsProcessTree -Root $root } finally { $root.Dispose() }',
|
|
45
46
|
].join('\n');
|
|
46
47
|
}
|
|
48
|
+
/** Retain every spawned child's native handle until this synchronous batch completes. */
|
|
49
|
+
function getWindowsProcessTreeBatchTerminationScript(pids) {
|
|
50
|
+
if (!pids.length || pids.some((pid) => !Number.isSafeInteger(pid) || pid <= 0)) {
|
|
51
|
+
throw new Error('Live, owned child PIDs are required for Windows process-tree cleanup.');
|
|
52
|
+
}
|
|
53
|
+
return [
|
|
54
|
+
exports.windowsProcessTreeScript,
|
|
55
|
+
'$failures = [System.Collections.Generic.List[string]]::new()',
|
|
56
|
+
`foreach ($rootId in @(${pids.join(',')})) {`,
|
|
57
|
+
' $root = $null',
|
|
58
|
+
' try {',
|
|
59
|
+
' $root = [PylanceOwnedWindowsProcess]::Open($rootId)',
|
|
60
|
+
' Stop-OwnedWindowsProcessTree -Root $root',
|
|
61
|
+
' } catch {',
|
|
62
|
+
' $failures.Add("Owned root $rootId`: $($_.Exception.Message)")',
|
|
63
|
+
' } finally {',
|
|
64
|
+
' if ($null -ne $root) { $root.Dispose() }',
|
|
65
|
+
' }',
|
|
66
|
+
'}',
|
|
67
|
+
'if ($failures.Count) { throw ($failures -join [Environment]::NewLine) }',
|
|
68
|
+
].join('\n');
|
|
69
|
+
}
|
|
47
70
|
//# sourceMappingURL=windowsProcessTree.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windowsProcessTree.js","sourceRoot":"","sources":["../../../../../src/common/windowsProcessTree.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;AA2BH,wFASC;
|
|
1
|
+
{"version":3,"file":"windowsProcessTree.js","sourceRoot":"","sources":["../../../../../src/common/windowsProcessTree.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;AA2BH,wFASC;AAGD,kGAoBC;AAzDD,wFAAmD;AAEnD,+EAA+E;AAC/E,oFAAoF;AACvE,QAAA,wBAAwB,GAAG;IACpC,iCAAiC;IACjC,uDAAuD;IACvD,6BAA6B;IAC7B,GAAG,iCAAU,CAAC,MAAM;IACpB,IAAI;IACJ,GAAG;IACH,GAAG,iCAAU,CAAC,SAAS;CAC1B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,+EAA+E;AAC/E,sFAAsF;AACzE,QAAA,gCAAgC,GAAG;IAC5C,SAAS;IACT,YAAY;IACZ,iBAAiB;IACjB,UAAU;IACV,sDAAsD;CACzD,CAAC;AAEF,0GAA0G;AAC1G,SAAgB,sCAAsC,CAAC,GAAW;IAC9D,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;IAC7F,CAAC;IACD,OAAO;QACH,gCAAwB;QACxB,8CAA8C,GAAG,GAAG;QACpD,8EAA8E;KACjF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC;AAED,yFAAyF;AACzF,SAAgB,2CAA2C,CAAC,IAAuB;IAC/E,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC;QAC7E,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;IAC7F,CAAC;IACD,OAAO;QACH,gCAAwB;QACxB,8DAA8D;QAC9D,yBAAyB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM;QAC7C,mBAAmB;QACnB,WAAW;QACX,6DAA6D;QAC7D,kDAAkD;QAClD,eAAe;QACf,uEAAuE;QACvE,iBAAiB;QACjB,kDAAkD;QAClD,OAAO;QACP,GAAG;QACH,yEAAyE;KAC5E,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC"}
|
|
@@ -60,6 +60,7 @@
|
|
|
60
60
|
" : base(error, \"Cannot pin candidate process \" + processId + \" (Win32 error \" + error + \": \" + new Win32Exception(error).Message + \")\")",
|
|
61
61
|
" {",
|
|
62
62
|
" ProcessId = processId;",
|
|
63
|
+
" if (error == 87 && processId > 0) Data[\"PylanceAbsentProcessId\"] = processId;",
|
|
63
64
|
" }",
|
|
64
65
|
" }",
|
|
65
66
|
"",
|
|
@@ -174,7 +175,7 @@
|
|
|
174
175
|
" public void Resume()",
|
|
175
176
|
" {",
|
|
176
177
|
" if (!suspended) return;",
|
|
177
|
-
" if (!HasExited)
|
|
178
|
+
" if (!HasExited) CheckControlStatus(NtResumeProcess(handle), \"resume owned process \" + Id);",
|
|
178
179
|
" suspended = false;",
|
|
179
180
|
" }",
|
|
180
181
|
"",
|
|
@@ -240,6 +241,14 @@
|
|
|
240
241
|
" }",
|
|
241
242
|
" }",
|
|
242
243
|
"",
|
|
244
|
+
" private static bool CheckControlStatus(int status, string operation)",
|
|
245
|
+
" {",
|
|
246
|
+
" // Exit can start after HasExited; the tree must still wait for the retained handle to signal.",
|
|
247
|
+
" if (status == ProcessIsTerminating) return false;",
|
|
248
|
+
" CheckStatus(status, operation);",
|
|
249
|
+
" return true;",
|
|
250
|
+
" }",
|
|
251
|
+
"",
|
|
243
252
|
" private static void CheckStatus(int status, string operation)",
|
|
244
253
|
" {",
|
|
245
254
|
" if (status < 0) throw new InvalidOperationException(\"Cannot \" + operation + \" (NTSTATUS 0x\" + status.ToString(\"X8\") + \").\");",
|
|
@@ -355,6 +364,7 @@
|
|
|
355
364
|
" $watch = [System.Diagnostics.Stopwatch]::StartNew()",
|
|
356
365
|
" $held = [System.Collections.Generic.List[object]]::new()",
|
|
357
366
|
" $known = @{}",
|
|
367
|
+
" $missing = @{}",
|
|
358
368
|
" $failure = $null",
|
|
359
369
|
" $cleanupErrors = [System.Collections.Generic.List[string]]::new()",
|
|
360
370
|
" try {",
|
|
@@ -423,8 +433,12 @@
|
|
|
423
433
|
" catch {",
|
|
424
434
|
" $openFailure = $_.Exception",
|
|
425
435
|
" while ($openFailure.InnerException) { $openFailure = $openFailure.InnerException }",
|
|
426
|
-
"
|
|
427
|
-
" $openFailure.NativeErrorCode -
|
|
436
|
+
" $typedAbsent = $openFailure -is [PylanceOwnedWindowsProcess+CandidateOpenException] -and",
|
|
437
|
+
" $openFailure.NativeErrorCode -eq 87 -and $openFailure.ProcessId -eq $hintId",
|
|
438
|
+
" $taggedAbsent = $openFailure -is [System.ComponentModel.Win32Exception] -and",
|
|
439
|
+
" $openFailure.NativeErrorCode -eq 87 -and",
|
|
440
|
+
" $openFailure.Data['PylanceAbsentProcessId'] -eq $hintId",
|
|
441
|
+
" if (!$typedAbsent -and !$taggedAbsent) {",
|
|
428
442
|
" throw",
|
|
429
443
|
" }",
|
|
430
444
|
" if ($hintId -le 0 -or $hintBirth -le 0) {",
|
|
@@ -503,6 +517,12 @@
|
|
|
503
517
|
" }",
|
|
504
518
|
" }",
|
|
505
519
|
" }",
|
|
520
|
+
" # Missing candidates require another snapshot, not an assumed empty descendant branch.",
|
|
521
|
+
" foreach ($hint in $hints) {",
|
|
522
|
+
" if ($missing.ContainsKey([int]$hint.ParentId)) {",
|
|
523
|
+
" throw \"Cannot establish descendant ownership after candidate $($hint.ParentId) disappeared; cleanup is incomplete.\"",
|
|
524
|
+
" }",
|
|
525
|
+
" }",
|
|
506
526
|
" if (!$found) { break }",
|
|
507
527
|
" }",
|
|
508
528
|
" # Leave ancestors alive on failure so their owner can retain the root and retry cleanup.",
|
|
@@ -43,6 +43,7 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
|
|
|
43
43
|
private _workspaceDiagnosticsReporter;
|
|
44
44
|
private _workspaceDiagnosticsProgressReporter;
|
|
45
45
|
private _workspaceDiagnosticsResolve;
|
|
46
|
+
private _workspaceDiagnosticsCancellationDisposable;
|
|
46
47
|
protected isDisposed: boolean;
|
|
47
48
|
protected client: ClientCapabilities;
|
|
48
49
|
protected defaultClientConfig: any;
|
|
@@ -134,9 +135,11 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
|
|
|
134
135
|
reporter: WorkDoneProgressReporter;
|
|
135
136
|
source: AbstractCancellationTokenSource;
|
|
136
137
|
}>;
|
|
138
|
+
protected getWorkspaceDiagnosticVersion(version: number | undefined): number | null;
|
|
137
139
|
protected sendDiagnostics(params: PublishDiagnosticsParams[]): void;
|
|
138
140
|
protected convertLspUriStringToUri(uri: string): Uri;
|
|
139
141
|
protected addDynamicFeature(feature: DynamicFeature): void;
|
|
142
|
+
private _completeWorkspaceDiagnostics;
|
|
140
143
|
private _getCompatibleMarkupKind;
|
|
141
144
|
private _convertDiagnostics;
|
|
142
145
|
}
|