@zzzen/pyright-internal 1.2.0-dev.20240331 → 1.2.0-dev.20240414
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/analyzerFileInfo.d.ts +0 -1
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/binder.js +24 -7
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cacheManager.d.ts +11 -0
- package/dist/analyzer/cacheManager.js +59 -2
- package/dist/analyzer/cacheManager.js.map +1 -1
- package/dist/analyzer/checker.d.ts +2 -2
- package/dist/analyzer/checker.js +29 -20
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.js +14 -2
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowTypes.d.ts +1 -0
- package/dist/analyzer/codeFlowTypes.js.map +1 -1
- package/dist/analyzer/constraintSolver.js +44 -11
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/constructorTransform.js +2 -2
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/constructors.d.ts +2 -2
- package/dist/analyzer/constructors.js +162 -109
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.js +17 -7
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/enums.js +7 -3
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/functionTransform.js +1 -1
- package/dist/analyzer/functionTransform.js.map +1 -1
- package/dist/analyzer/importResolver.js +1 -1
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importStatementUtils.d.ts +6 -6
- package/dist/analyzer/importStatementUtils.js +43 -43
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.js +1 -1
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +6 -6
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +8 -5
- package/dist/analyzer/parseTreeUtils.js +36 -14
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +1 -1
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +4 -3
- package/dist/analyzer/program.js +21 -12
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.js +12 -12
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/protocols.js +10 -10
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/pyTypedUtils.d.ts +4 -0
- package/dist/analyzer/pyTypedUtils.js +17 -3
- package/dist/analyzer/pyTypedUtils.js.map +1 -1
- package/dist/analyzer/service.d.ts +3 -2
- package/dist/analyzer/service.js +7 -4
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +5 -3
- package/dist/analyzer/sourceFile.js +108 -71
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.js +1 -1
- package/dist/analyzer/sourceMapper.js +6 -6
- package/dist/analyzer/symbol.d.ts +4 -1
- package/dist/analyzer/symbol.js +10 -0
- package/dist/analyzer/symbol.js.map +1 -1
- package/dist/analyzer/symbolUtils.d.ts +2 -1
- package/dist/analyzer/symbolUtils.js +13 -3
- package/dist/analyzer/symbolUtils.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.js +1 -1
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +254 -119
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +3 -1
- package/dist/analyzer/typeGuards.js +107 -59
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeStubWriter.js +1 -1
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +1 -1
- package/dist/analyzer/typeUtils.js +33 -33
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeVarContext.js +1 -1
- package/dist/analyzer/typeVarContext.js.map +1 -1
- package/dist/analyzer/typedDicts.js +30 -21
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +7 -3
- package/dist/analyzer/types.js +48 -8
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundAnalysis.d.ts +1 -0
- package/dist/backgroundAnalysis.js +5 -1
- package/dist/backgroundAnalysis.js.map +1 -1
- package/dist/backgroundAnalysisBase.d.ts +2 -1
- package/dist/backgroundAnalysisBase.js +8 -1
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/backgroundThreadBase.d.ts +6 -5
- package/dist/backgroundThreadBase.js +9 -5
- package/dist/backgroundThreadBase.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +4 -4
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/extensibility.d.ts +3 -2
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/serviceProviderExtensions.d.ts +2 -0
- package/dist/common/serviceProviderExtensions.js +4 -0
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/common/textEditTracker.d.ts +5 -5
- package/dist/common/textEditTracker.js +33 -33
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/workspaceEditUtils.js +2 -2
- package/dist/common/workspaceEditUtils.js.map +1 -1
- package/dist/languageServerBase.d.ts +4 -4
- package/dist/languageServerBase.js +1 -1
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +3 -3
- package/dist/languageService/autoImporter.js +2 -1
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +2 -2
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +2 -4
- package/dist/languageService/completionProvider.js +15 -37
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/definitionProvider.js +1 -1
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentHighlightProvider.js +2 -2
- package/dist/languageService/documentHighlightProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.js +1 -1
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.js +1 -1
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/hoverProvider.js +2 -2
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/importSorter.d.ts +2 -2
- package/dist/languageService/importSorter.js +1 -1
- package/dist/languageService/importSorter.js.map +1 -1
- package/dist/languageService/referencesProvider.d.ts +4 -4
- package/dist/languageService/referencesProvider.js +2 -2
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.js +2 -2
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +2 -2
- package/dist/languageService/symbolIndexer.js +2 -2
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/tooltipUtils.d.ts +1 -1
- package/dist/languageService/tooltipUtils.js +4 -4
- package/dist/languageService/workspaceSymbolProvider.js +1 -1
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +7 -0
- package/dist/localization/localize.js +5 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +1 -0
- package/dist/localization/package.nls.de.json +2 -1
- package/dist/localization/package.nls.en-us.json +28 -23
- package/dist/localization/package.nls.es.json +5 -4
- package/dist/localization/package.nls.fr.json +5 -4
- package/dist/localization/package.nls.it.json +2 -1
- package/dist/localization/package.nls.ja.json +1 -0
- package/dist/localization/package.nls.ko.json +4 -3
- package/dist/localization/package.nls.pl.json +4 -3
- package/dist/localization/package.nls.pt-br.json +1 -0
- package/dist/localization/package.nls.qps-ploc.json +1 -0
- package/dist/localization/package.nls.ru.json +2 -1
- package/dist/localization/package.nls.tr.json +3 -2
- package/dist/localization/package.nls.zh-cn.json +2 -1
- package/dist/localization/package.nls.zh-tw.json +1 -0
- package/dist/nodeMain.d.ts +1 -1
- package/dist/nodeMain.js +2 -2
- package/dist/nodeMain.js.map +1 -1
- package/dist/parser/parser.d.ts +7 -4
- package/dist/parser/parser.js +10 -7
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/tokenizer.js +1 -0
- package/dist/parser/tokenizer.js.map +1 -1
- package/dist/parser/tokenizerTypes.d.ts +1 -0
- package/dist/parser/tokenizerTypes.js +1 -0
- package/dist/parser/tokenizerTypes.js.map +1 -1
- package/dist/server.d.ts +3 -3
- package/dist/server.js +3 -3
- package/dist/server.js.map +1 -1
- package/dist/tests/cacheManager.test.js +35 -0
- package/dist/tests/cacheManager.test.js.map +1 -1
- package/dist/tests/chainedSourceFiles.test.js +7 -7
- package/dist/tests/chainedSourceFiles.test.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +5 -5
- package/dist/tests/harness/fourslash/testState.js +8 -7
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.d.ts +2 -2
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js +5 -5
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +4 -4
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/ipythonMode.test.js +1 -1
- package/dist/tests/ipythonMode.test.js.map +1 -1
- package/dist/tests/lsp/languageServer.js +1 -1
- package/dist/tests/lsp/languageServer.js.map +1 -1
- package/dist/tests/lsp/languageServerTestUtils.d.ts +1 -1
- package/dist/tests/parser.test.js +14 -14
- package/dist/tests/parser.test.js.map +1 -1
- package/dist/tests/signatureHelp.test.js +1 -1
- package/dist/tests/signatureHelp.test.js.map +1 -1
- package/dist/tests/testStateUtils.js +5 -3
- package/dist/tests/testStateUtils.js.map +1 -1
- package/dist/tests/testUtils.d.ts +4 -8
- package/dist/tests/testUtils.js +4 -7
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/textEditUtil.test.js +3 -3
- package/dist/tests/textEditUtil.test.js.map +1 -1
- package/dist/tests/tokenizer.test.js +4 -4
- package/dist/tests/tokenizer.test.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +6 -2
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +4 -0
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +21 -11
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +1 -1
- package/package.json +2 -2
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"languageServer.js","sourceRoot":"","sources":["../../../../../../src/tests/lsp/languageServer.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"languageServer.js","sourceRoot":"","sources":["../../../../../../src/tests/lsp/languageServer.ts"],"names":[],"mappings":"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"}
|
@@ -61,7 +61,7 @@ export declare function updateSettingsMap(info: PyrightServerInfo, settings: {
|
|
61
61
|
item: ConfigurationItem;
|
62
62
|
value: any;
|
63
63
|
}[]): void;
|
64
|
-
export declare function getParseResults(fileContents: string, isStubFile?: boolean, ipythonMode?: IPythonMode): import("../../parser/parser").
|
64
|
+
export declare function getParseResults(fileContents: string, isStubFile?: boolean, ipythonMode?: IPythonMode): import("../../parser/parser").ParseFileResults;
|
65
65
|
export declare function waitForDiagnostics(info: PyrightServerInfo, timeout?: number): Promise<PublishDiagnosticsParams[]>;
|
66
66
|
interface ProgressPart {
|
67
67
|
}
|
@@ -40,15 +40,15 @@ const testState_1 = require("./harness/fourslash/testState");
|
|
40
40
|
const TestUtils = __importStar(require("./testUtils"));
|
41
41
|
test('Empty', () => {
|
42
42
|
const diagSink = new diagnosticSink_1.DiagnosticSink();
|
43
|
-
const
|
43
|
+
const parserOutput = TestUtils.parseText('', diagSink).parserOutput;
|
44
44
|
assert.equal(diagSink.fetchAndClear().length, 0);
|
45
|
-
assert.equal(
|
45
|
+
assert.equal(parserOutput.parseTree.statements.length, 0);
|
46
46
|
});
|
47
47
|
test('Sample1', () => {
|
48
48
|
const diagSink = new diagnosticSink_1.DiagnosticSink();
|
49
|
-
const
|
49
|
+
const parserOutput = TestUtils.parseSampleFile('sample1.py', diagSink).parserOutput;
|
50
50
|
assert.equal(diagSink.fetchAndClear().length, 0);
|
51
|
-
assert.equal(
|
51
|
+
assert.equal(parserOutput.parseTree.statements.length, 4);
|
52
52
|
});
|
53
53
|
test('FStringEmptyTuple', () => {
|
54
54
|
assert.doesNotThrow(() => {
|
@@ -73,11 +73,11 @@ test('SuiteExpectedColon3', () => {
|
|
73
73
|
});
|
74
74
|
test('ExpressionWrappedInParens', () => {
|
75
75
|
const diagSink = new diagnosticSink_1.DiagnosticSink();
|
76
|
-
const
|
76
|
+
const parserOutput = TestUtils.parseText('(str)', diagSink).parserOutput;
|
77
77
|
assert.equal(diagSink.fetchAndClear().length, 0);
|
78
|
-
assert.equal(
|
79
|
-
assert.equal(
|
80
|
-
const statementList =
|
78
|
+
assert.equal(parserOutput.parseTree.statements.length, 1);
|
79
|
+
assert.equal(parserOutput.parseTree.statements[0].nodeType, 47 /* ParseNodeType.StatementList */);
|
80
|
+
const statementList = parserOutput.parseTree.statements[0];
|
81
81
|
assert.equal(statementList.statements.length, 1);
|
82
82
|
// length of node should include parens
|
83
83
|
assert.equal(statementList.statements[0].nodeType, 38 /* ParseNodeType.Name */);
|
@@ -105,22 +105,22 @@ test('ModuleName range', () => {
|
|
105
105
|
});
|
106
106
|
test('ParserRecovery1', () => {
|
107
107
|
const diagSink = new diagnosticSink_1.DiagnosticSink();
|
108
|
-
const parseResults = TestUtils.parseSampleFile('parserRecovery1.py', diagSink)
|
109
|
-
const node = (0, parseTreeUtils_1.findNodeByOffset)(parseResults.parseTree, parseResults.text.length - 2);
|
108
|
+
const parseResults = TestUtils.parseSampleFile('parserRecovery1.py', diagSink);
|
109
|
+
const node = (0, parseTreeUtils_1.findNodeByOffset)(parseResults.parserOutput.parseTree, parseResults.text.length - 2);
|
110
110
|
const functionNode = (0, parseTreeUtils_1.getFirstAncestorOrSelfOfKind)(node, 28 /* ParseNodeType.Function */);
|
111
111
|
assert.equal(functionNode.parent.nodeType, 36 /* ParseNodeType.Module */);
|
112
112
|
});
|
113
113
|
test('ParserRecovery2', () => {
|
114
114
|
const diagSink = new diagnosticSink_1.DiagnosticSink();
|
115
|
-
const parseResults = TestUtils.parseSampleFile('parserRecovery2.py', diagSink)
|
116
|
-
const node = (0, parseTreeUtils_1.findNodeByOffset)(parseResults.parseTree, parseResults.text.length - 2);
|
115
|
+
const parseResults = TestUtils.parseSampleFile('parserRecovery2.py', diagSink);
|
116
|
+
const node = (0, parseTreeUtils_1.findNodeByOffset)(parseResults.parserOutput.parseTree, parseResults.text.length - 2);
|
117
117
|
const functionNode = (0, parseTreeUtils_1.getFirstAncestorOrSelfOfKind)(node, 28 /* ParseNodeType.Function */);
|
118
118
|
assert.equal(functionNode.parent.nodeType, 50 /* ParseNodeType.Suite */);
|
119
119
|
});
|
120
120
|
test('ParserRecovery3', () => {
|
121
121
|
const diagSink = new diagnosticSink_1.DiagnosticSink();
|
122
|
-
const parseResults = TestUtils.parseSampleFile('parserRecovery3.py', diagSink)
|
123
|
-
const node = (0, parseTreeUtils_1.findNodeByOffset)(parseResults.parseTree, parseResults.text.length - 2);
|
122
|
+
const parseResults = TestUtils.parseSampleFile('parserRecovery3.py', diagSink);
|
123
|
+
const node = (0, parseTreeUtils_1.findNodeByOffset)(parseResults.parserOutput.parseTree, parseResults.text.length - 2);
|
124
124
|
const functionNode = (0, parseTreeUtils_1.getFirstAncestorOrSelfOfKind)(node, 28 /* ParseNodeType.Function */);
|
125
125
|
assert.equal(functionNode.parent.nodeType, 36 /* ParseNodeType.Module */);
|
126
126
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"parser.test.js","sourceRoot":"","sources":["../../../../../src/tests/parser.test.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,+CAAiC;AAEjC,+DAA4F;AAC5F,6DAA0D;AAC1D,mDAAgD;AAEhD,6DAAsF;AACtF,uDAAyC;AAEzC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;IACf,MAAM,QAAQ,GAAG,IAAI,+BAAc,EAAE,CAAC;IACtC,MAAM,YAAY,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"parser.test.js","sourceRoot":"","sources":["../../../../../src/tests/parser.test.ts"],"names":[],"mappings":"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"}
|
@@ -66,7 +66,7 @@ test('within arguments in format string segment', () => {
|
|
66
66
|
function checkSignatureHelp(code, expects) {
|
67
67
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
68
68
|
const marker = state.getMarkerByName('marker');
|
69
|
-
const parseResults = state.workspace.service.
|
69
|
+
const parseResults = state.workspace.service.getParseResults(marker.fileUri);
|
70
70
|
const position = (0, positionUtils_1.convertOffsetToPosition)(marker.position, parseResults.tokenizerOutput.lines);
|
71
71
|
const actual = new signatureHelpProvider_1.SignatureHelpProvider(state.workspace.service.test_program, marker.fileUri, position, vscode_languageserver_1.MarkupKind.Markdown,
|
72
72
|
/*hasSignatureLabelOffsetCapability*/ true,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"signatureHelp.test.js","sourceRoot":"","sources":["../../../../../src/tests/signatureHelp.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAEH,oDAA4B;AAC5B,iEAAsE;AAEtE,2DAAkE;AAClE,oFAAiF;AACjF,6DAAqE;AAErE,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACnD,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yCAAyC,EAAE,GAAG,EAAE;IACjD,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAC5D,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAC9D,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;IAC9C,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACnD,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,SAAS,kBAAkB,CAAC,IAAY,EAAE,OAAgB;IACtD,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,
|
1
|
+
{"version":3,"file":"signatureHelp.test.js","sourceRoot":"","sources":["../../../../../src/tests/signatureHelp.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAEH,oDAA4B;AAC5B,iEAAsE;AAEtE,2DAAkE;AAClE,oFAAiF;AACjF,6DAAqE;AAErE,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACnD,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yCAAyC,EAAE,GAAG,EAAE;IACjD,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAC5D,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAC9D,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;IAC9C,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACnD,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,SAAS,kBAAkB,CAAC,IAAY,EAAE,OAAgB;IACtD,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAE,CAAC;IAC9E,MAAM,QAAQ,GAAG,IAAA,uCAAuB,EAAC,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IAE9F,MAAM,MAAM,GAAG,IAAI,6CAAqB,CACpC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,EACpC,MAAM,CAAC,OAAO,EACd,QAAQ,EACR,kCAAU,CAAC,QAAQ;IACnB,qCAAqC,CAAC,IAAI;IAC1C,gCAAgC,CAAC,IAAI;IACrC,WAAW,CAAC,SAAS,EACrB,yCAAiB,CAAC,IAAI,CACzB,CAAC,gBAAgB,EAAE,CAAC;IAErB,gBAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC"}
|
@@ -18,10 +18,10 @@ const collectionUtils_1 = require("../common/collectionUtils");
|
|
18
18
|
const core_1 = require("../common/core");
|
19
19
|
const debug_1 = require("../common/debug");
|
20
20
|
const textRange_1 = require("../common/textRange");
|
21
|
+
const uri_1 = require("../common/uri/uri");
|
21
22
|
const uriUtils_1 = require("../common/uri/uriUtils");
|
22
23
|
const workspaceEditUtils_1 = require("../common/workspaceEditUtils");
|
23
24
|
const documentSymbolCollector_1 = require("../languageService/documentSymbolCollector");
|
24
|
-
const uri_1 = require("../common/uri/uri");
|
25
25
|
function convertFileEditActionToString(edit) {
|
26
26
|
return `'${edit.replacementText.replace(/\n/g, '!n!')}'@'${edit.fileUri}:(${edit.range.start.line},${edit.range.start.character})-(${edit.range.end.line},${edit.range.end.character})'`;
|
27
27
|
}
|
@@ -109,12 +109,14 @@ function _applyEdits(state, filePath, edits) {
|
|
109
109
|
function verifyReferencesAtPosition(program, configOption, symbolNames, fileName, position, ranges) {
|
110
110
|
const sourceFile = program.getBoundSourceFile(uri_1.Uri.file(fileName, program.serviceProvider));
|
111
111
|
(0, assert_1.default)(sourceFile);
|
112
|
-
const node = (0, parseTreeUtils_1.findNodeByOffset)(sourceFile.getParseResults().parseTree, position);
|
112
|
+
const node = (0, parseTreeUtils_1.findNodeByOffset)(sourceFile.getParseResults().parserOutput.parseTree, position);
|
113
113
|
const decls = documentSymbolCollector_1.DocumentSymbolCollector.getDeclarationsForNode(program, node,
|
114
114
|
/* resolveLocalName */ true, vscode_languageserver_1.CancellationToken.None);
|
115
115
|
const rangesByFile = (0, collectionUtils_1.createMapFromItems)(ranges, (r) => r.fileName);
|
116
116
|
for (const rangeFileName of rangesByFile.keys()) {
|
117
|
-
const collector = new documentSymbolCollector_1.DocumentSymbolCollector(program, (0, core_1.isArray)(symbolNames) ? symbolNames : [symbolNames], decls, program
|
117
|
+
const collector = new documentSymbolCollector_1.DocumentSymbolCollector(program, (0, core_1.isArray)(symbolNames) ? symbolNames : [symbolNames], decls, program
|
118
|
+
.getBoundSourceFile(uri_1.Uri.file(rangeFileName, program.serviceProvider))
|
119
|
+
.getParseResults().parserOutput.parseTree, vscode_languageserver_1.CancellationToken.None, {
|
118
120
|
treatModuleInImportAndFromImportSame: true,
|
119
121
|
skipUnreachableCode: false,
|
120
122
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"testStateUtils.js","sourceRoot":"","sources":["../../../../../src/tests/testStateUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;AAEH,oDAA4B;AAE5B,iEAA0D;AAC1D,+DAA8D;AAE9D,+DAA+D;AAE/D,yCAAyC;AACzC,2CAA8C;AAE9C,mDAAgE;AAChE,qDAAgD;AAChD,qEAAsE;AACtE,wFAAqF;
|
1
|
+
{"version":3,"file":"testStateUtils.js","sourceRoot":"","sources":["../../../../../src/tests/testStateUtils.ts"],"names":[],"mappings":"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"}
|
@@ -4,10 +4,10 @@ import { ConsoleWithLogLevel } from '../common/console';
|
|
4
4
|
import { Diagnostic } from '../common/diagnostic';
|
5
5
|
import { DiagnosticSink } from '../common/diagnosticSink';
|
6
6
|
import { Uri } from '../common/uri/uri';
|
7
|
-
import {
|
7
|
+
import { ParseFileResults, ParseOptions } from '../parser/parser';
|
8
8
|
export interface FileAnalysisResult {
|
9
9
|
fileUri: Uri;
|
10
|
-
parseResults?:
|
10
|
+
parseResults?: ParseFileResults | undefined;
|
11
11
|
errors: Diagnostic[];
|
12
12
|
warnings: Diagnostic[];
|
13
13
|
infos: Diagnostic[];
|
@@ -15,14 +15,10 @@ export interface FileAnalysisResult {
|
|
15
15
|
unreachableCodes: Diagnostic[];
|
16
16
|
deprecateds: Diagnostic[];
|
17
17
|
}
|
18
|
-
export interface FileParseResult {
|
19
|
-
fileContents: string;
|
20
|
-
parseResults: ParseResults;
|
21
|
-
}
|
22
18
|
export declare function resolveSampleFilePath(fileName: string): string;
|
23
19
|
export declare function readSampleFile(fileName: string): string;
|
24
|
-
export declare function parseText(textToParse: string, diagSink: DiagnosticSink, parseOptions?: ParseOptions):
|
25
|
-
export declare function parseSampleFile(fileName: string, diagSink: DiagnosticSink, execEnvironment?: ExecutionEnvironment):
|
20
|
+
export declare function parseText(textToParse: string, diagSink: DiagnosticSink, parseOptions?: ParseOptions): ParseFileResults;
|
21
|
+
export declare function parseSampleFile(fileName: string, diagSink: DiagnosticSink, execEnvironment?: ExecutionEnvironment): ParseFileResults;
|
26
22
|
export declare function typeAnalyzeSampleFiles(fileNames: string[], configOptions?: ConfigOptions, console?: ConsoleWithLogLevel): FileAnalysisResult[];
|
27
23
|
export declare function getAnalysisResults(program: Program, fileUris: Uri[], configOptions?: ConfigOptions): FileAnalysisResult[];
|
28
24
|
export declare function printDiagnostics(fileResults: FileAnalysisResult): void;
|
package/dist/tests/testUtils.js
CHANGED
@@ -45,8 +45,8 @@ const fullAccessHost_1 = require("../common/fullAccessHost");
|
|
45
45
|
const realFileSystem_1 = require("../common/realFileSystem");
|
46
46
|
const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
|
47
47
|
const uri_1 = require("../common/uri/uri");
|
48
|
-
const parser_1 = require("../parser/parser");
|
49
48
|
const uriUtils_1 = require("../common/uri/uriUtils");
|
49
|
+
const parser_1 = require("../parser/parser");
|
50
50
|
// This is a bit gross, but it's necessary to allow the fallback typeshed
|
51
51
|
// directory to be located when running within the jest environment. This
|
52
52
|
// assumes that the working directory has been set appropriately before
|
@@ -82,10 +82,7 @@ function parseSampleFile(fileName, diagSink, execEnvironment = new configOptions
|
|
82
82
|
parseOptions.isStubFile = true;
|
83
83
|
}
|
84
84
|
parseOptions.pythonVersion = execEnvironment.pythonVersion;
|
85
|
-
return
|
86
|
-
fileContents: text,
|
87
|
-
parseResults: parseText(text, diagSink),
|
88
|
-
};
|
85
|
+
return parseText(text, diagSink);
|
89
86
|
}
|
90
87
|
exports.parseSampleFile = parseSampleFile;
|
91
88
|
function typeAnalyzeSampleFiles(fileNames, configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty()), console) {
|
@@ -101,9 +98,9 @@ function typeAnalyzeSampleFiles(fileNames, configOptions = new configOptions_1.C
|
|
101
98
|
// Set a "pre-check callback" so we can evaluate the types of each NameNode
|
102
99
|
// prior to checking the full document. This will exercise the contextual
|
103
100
|
// evaluation logic.
|
104
|
-
program.setPreCheckCallback((
|
101
|
+
program.setPreCheckCallback((parserOutput, evaluator) => {
|
105
102
|
const nameTypeWalker = new testWalker_1.NameTypeWalker(evaluator);
|
106
|
-
nameTypeWalker.walk(
|
103
|
+
nameTypeWalker.walk(parserOutput.parseTree);
|
107
104
|
});
|
108
105
|
const results = getAnalysisResults(program, fileUris, configOptions);
|
109
106
|
program.dispose();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../../../../src/tests/testUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,+CAAiC;AACjC,uCAAyB;AACzB,2CAA6B;AAE7B,+DAA4D;AAC5D,iDAA8C;AAC9C,uDAAwD;AAExD,2DAA8E;AAC9E,+CAAqE;AACrE,2CAAuC;AAGvC,6DAA0D;AAC1D,6DAAkF;AAClF,mFAA4E;AAC5E,2CAAwC;AACxC,
|
1
|
+
{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../../../../src/tests/testUtils.ts"],"names":[],"mappings":"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"}
|
@@ -92,9 +92,9 @@ function verifyRemoveNodes(code) {
|
|
92
92
|
const ranges = state.getRanges();
|
93
93
|
const changeRanges = _getChangeRanges(ranges);
|
94
94
|
for (const range of changeRanges) {
|
95
|
-
const
|
96
|
-
const node = (0, parseTreeUtils_1.findNodeByOffset)(
|
97
|
-
tracker.removeNodes({ node,
|
95
|
+
const parseFileResults = state.program.getParseResults(range.fileUri);
|
96
|
+
const node = (0, parseTreeUtils_1.findNodeByOffset)(parseFileResults.parserOutput.parseTree, range.pos);
|
97
|
+
tracker.removeNodes({ node, parseFileResults });
|
98
98
|
}
|
99
99
|
const edits = tracker.getEdits(vscode_jsonrpc_1.CancellationToken.None);
|
100
100
|
const editRanges = _getEditRanges(ranges);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"textEditUtil.test.js","sourceRoot":"","sources":["../../../../../src/tests/textEditUtil.test.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;AAEH,oDAA4B;AAC5B,mDAAmD;AAEnD,+DAA8D;AAC9D,qDAAsD;AACtD,+DAA4D;AAE5D,6DAAgF;AAChF,qDAAgE;AAEhE,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;IACpB,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,WAAW,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE;IACxB,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,WAAW,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE;IACxB,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,WAAW,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC3B,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,WAAW,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,WAAW,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAC7B,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,WAAW,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;IACtC,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;IAC9C,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,MAAM,IAAI,GAAG;;KAEZ,CAAC;IAEF,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;IACzB,MAAM,IAAI,GAAG;;;;;KAKZ,CAAC;IAEF,iBAAiB,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,SAAS,iBAAiB,CAAC,IAAY;IACnC,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAI,iCAAe,EAAE,CAAC;IAEtC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;IACjC,MAAM,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC9C,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;QAC9B,MAAM,
|
1
|
+
{"version":3,"file":"textEditUtil.test.js","sourceRoot":"","sources":["../../../../../src/tests/textEditUtil.test.ts"],"names":[],"mappings":"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"}
|
@@ -983,14 +983,14 @@ test('Strings: good name escapes', () => {
|
|
983
983
|
const stringToken0 = results.tokens.getItemAt(0);
|
984
984
|
const unescapedValue0 = StringTokenUtils.getUnescapedString(stringToken0);
|
985
985
|
assert_1.default.equal(stringToken0.type, 5 /* TokenType.String */);
|
986
|
-
assert_1.default.equal(stringToken0.flags, 2 /* StringTokenFlags.DoubleQuote */);
|
986
|
+
assert_1.default.equal(stringToken0.flags, 2 /* StringTokenFlags.DoubleQuote */ | 512 /* StringTokenFlags.NamedUnicodeEscape */);
|
987
987
|
assert_1.default.equal(stringToken0.length, 23);
|
988
988
|
assert_1.default.equal(stringToken0.escapedValue, '\\N{caret escape blah}');
|
989
989
|
assert_1.default.equal(unescapedValue0.value, '-');
|
990
990
|
const stringToken1 = results.tokens.getItemAt(1);
|
991
991
|
const unescapedValue1 = StringTokenUtils.getUnescapedString(stringToken1);
|
992
992
|
assert_1.default.equal(stringToken1.type, 5 /* TokenType.String */);
|
993
|
-
assert_1.default.equal(stringToken1.flags, 2 /* StringTokenFlags.DoubleQuote */);
|
993
|
+
assert_1.default.equal(stringToken1.flags, 2 /* StringTokenFlags.DoubleQuote */ | 512 /* StringTokenFlags.NamedUnicodeEscape */);
|
994
994
|
assert_1.default.equal(stringToken1.length, 10);
|
995
995
|
assert_1.default.equal(stringToken1.escapedValue, 'a\\N{A9}a');
|
996
996
|
assert_1.default.equal(unescapedValue1.value, 'a-a');
|
@@ -1002,7 +1002,7 @@ test('Strings: bad name escapes', () => {
|
|
1002
1002
|
const stringToken0 = results.tokens.getItemAt(0);
|
1003
1003
|
const unescapedValue0 = StringTokenUtils.getUnescapedString(stringToken0);
|
1004
1004
|
assert_1.default.equal(stringToken0.type, 5 /* TokenType.String */);
|
1005
|
-
assert_1.default.equal(stringToken0.flags, 2 /* StringTokenFlags.DoubleQuote */);
|
1005
|
+
assert_1.default.equal(stringToken0.flags, 2 /* StringTokenFlags.DoubleQuote */ | 512 /* StringTokenFlags.NamedUnicodeEscape */);
|
1006
1006
|
assert_1.default.equal(unescapedValue0.unescapeErrors.length, 1);
|
1007
1007
|
assert_1.default.equal(stringToken0.length, 10);
|
1008
1008
|
assert_1.default.equal(stringToken0.escapedValue, '\\N{caret');
|
@@ -1010,7 +1010,7 @@ test('Strings: bad name escapes', () => {
|
|
1010
1010
|
const stringToken1 = results.tokens.getItemAt(1);
|
1011
1011
|
const unescapedValue1 = StringTokenUtils.getUnescapedString(stringToken1);
|
1012
1012
|
assert_1.default.equal(stringToken1.type, 5 /* TokenType.String */);
|
1013
|
-
assert_1.default.equal(stringToken1.flags, 2 /* StringTokenFlags.DoubleQuote */);
|
1013
|
+
assert_1.default.equal(stringToken1.flags, 2 /* StringTokenFlags.DoubleQuote */ | 512 /* StringTokenFlags.NamedUnicodeEscape */);
|
1014
1014
|
assert_1.default.equal(unescapedValue1.unescapeErrors.length, 1);
|
1015
1015
|
assert_1.default.equal(stringToken1.length, 9);
|
1016
1016
|
assert_1.default.equal(stringToken1.escapedValue, '\\N{.A9}');
|