@zzzen/pyright-internal 1.2.0-dev.20260222 → 1.2.0-dev.20260422
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/backgroundAnalysisProgram.d.ts +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.js +9 -6
- package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
- package/dist/analyzer/binder.d.ts +10 -1
- package/dist/analyzer/binder.js +258 -41
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cellChainIndex.d.ts +34 -0
- package/dist/analyzer/cellChainIndex.js +126 -0
- package/dist/analyzer/cellChainIndex.js.map +1 -0
- package/dist/analyzer/checker.js +0 -1
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.js +16 -1
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/constructors.js +9 -2
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +3 -21
- package/dist/analyzer/importResolver.js +42 -316
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importResolverFileSystem.d.ts +3 -0
- package/dist/analyzer/importResolverFileSystem.js +160 -0
- package/dist/analyzer/importResolverFileSystem.js.map +1 -0
- package/dist/analyzer/importResolverTypes.d.ts +24 -0
- package/dist/analyzer/importResolverTypes.js +8 -0
- package/dist/analyzer/importResolverTypes.js.map +1 -0
- package/dist/analyzer/importStatementUtils.js +9 -0
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +1 -0
- package/dist/analyzer/parseTreeUtils.js +24 -7
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +14 -2
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +5 -3
- package/dist/analyzer/program.js +40 -51
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.d.ts +1 -1
- package/dist/analyzer/pythonPathUtils.js +3 -1
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/scope.d.ts +10 -1
- package/dist/analyzer/scope.js +14 -1
- package/dist/analyzer/scope.js.map +1 -1
- package/dist/analyzer/service.d.ts +11 -6
- package/dist/analyzer/service.js +82 -83
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceEnumerator.d.ts +3 -0
- package/dist/analyzer/sourceEnumerator.js +27 -1
- package/dist/analyzer/sourceEnumerator.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +2 -1
- package/dist/analyzer/sourceFile.js +2 -2
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfo.d.ts +4 -0
- package/dist/analyzer/sourceFileInfo.js +9 -0
- package/dist/analyzer/sourceFileInfo.js.map +1 -1
- package/dist/analyzer/sourceMapper.d.ts +1 -0
- package/dist/analyzer/sourceMapper.js +44 -0
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/tuples.js +3 -1
- package/dist/analyzer/tuples.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +102 -51
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +2 -0
- package/dist/analyzer/typeEvaluatorTypes.js +4 -0
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.js +28 -6
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeStubWriter.d.ts +15 -50
- package/dist/analyzer/typeStubWriter.js +91 -9
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +1 -0
- package/dist/analyzer/typeUtils.js +27 -3
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeshedInfoProvider.d.ts +2 -0
- package/dist/analyzer/typeshedInfoProvider.js +232 -0
- package/dist/analyzer/typeshedInfoProvider.js.map +1 -0
- package/dist/backgroundAnalysisBase.d.ts +3 -3
- package/dist/backgroundAnalysisBase.js +12 -9
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/commands/createTypeStub.d.ts +16 -8
- package/dist/commands/createTypeStub.js +58 -36
- package/dist/commands/createTypeStub.js.map +1 -1
- package/dist/common/cancellationUtils.d.ts +7 -0
- package/dist/common/cancellationUtils.js +34 -0
- package/dist/common/cancellationUtils.js.map +1 -1
- package/dist/common/collectionUtils.d.ts +3 -3
- package/dist/common/collectionUtils.js.map +1 -1
- package/dist/common/core.d.ts +1 -1
- package/dist/common/core.js.map +1 -1
- package/dist/common/crypto.js +11 -0
- package/dist/common/crypto.js.map +1 -1
- package/dist/common/extensibility.d.ts +7 -0
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/fullAccessHost.js +4 -2
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/pathUtils.d.ts +4 -1
- package/dist/common/pathUtils.js.map +1 -1
- package/dist/common/realFileSystem.js +42 -3
- package/dist/common/realFileSystem.js.map +1 -1
- package/dist/common/serviceKeys.d.ts +3 -0
- package/dist/common/serviceKeys.js +2 -0
- package/dist/common/serviceKeys.js.map +1 -1
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/common/uri/uriUtils.d.ts +4 -0
- package/dist/common/uri/uriUtils.js +19 -3
- package/dist/common/uri/uriUtils.js.map +1 -1
- package/dist/common/workspaceEditUtils.js +0 -2
- package/dist/common/workspaceEditUtils.js.map +1 -1
- package/dist/languageServerBase.d.ts +1 -0
- package/dist/languageServerBase.js +6 -0
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +6 -0
- package/dist/languageService/completionProvider.js +252 -75
- 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/documentSymbolCollector.js +34 -4
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/dynamicFeature.d.ts +3 -0
- package/dist/languageService/dynamicFeature.js +5 -0
- package/dist/languageService/dynamicFeature.js.map +1 -1
- package/dist/languageService/hoverProvider.d.ts +2 -1
- package/dist/languageService/hoverProvider.js +13 -5
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/pullDiagnosticsDynamicFeature.d.ts +1 -0
- package/dist/languageService/pullDiagnosticsDynamicFeature.js +4 -0
- package/dist/languageService/pullDiagnosticsDynamicFeature.js.map +1 -1
- package/dist/languageService/referencesProvider.js +5 -4
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.d.ts +1 -0
- package/dist/languageService/signatureHelpProvider.js +76 -2
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +1 -0
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/tooltipUtils.d.ts +11 -4
- package/dist/languageService/tooltipUtils.js +195 -7
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/parser/tokenizer.js +6 -2
- package/dist/parser/tokenizer.js.map +1 -1
- package/dist/partialStubService.d.ts +11 -0
- package/dist/partialStubService.js +23 -1
- package/dist/partialStubService.js.map +1 -1
- package/dist/pyright.js +13 -2
- package/dist/pyright.js.map +1 -1
- package/dist/tests/chainedSourceFiles.test.js +138 -0
- package/dist/tests/chainedSourceFiles.test.js.map +1 -1
- package/dist/tests/checker.test.js +12 -0
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/completions.test.js +328 -0
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/config.test.js +54 -0
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/filesystem.test.js +44 -0
- package/dist/tests/filesystem.test.js.map +1 -1
- package/dist/tests/fourSlashRunner.test.js +1 -1
- package/dist/tests/fourSlashRunner.test.js.map +1 -1
- package/dist/tests/fourslash/findDefinitions.definitionFilter.preferSource.fourslash.js +25 -1
- package/dist/tests/fourslash/findDefinitions.definitionFilter.preferSource.fourslash.js.map +1 -1
- package/dist/tests/fourslash/import.multipart3.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/import.multipart3.fourslash.js +46 -0
- package/dist/tests/fourslash/import.multipart3.fourslash.js.map +1 -0
- package/dist/tests/fourslash/import.pytyped.unsupportedDunderAll.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/import.pytyped.unsupportedDunderAll.fourslash.js +33 -0
- package/dist/tests/fourslash/import.pytyped.unsupportedDunderAll.fourslash.js.map +1 -0
- package/dist/tests/harness/fourslash/runner.d.ts +4 -4
- package/dist/tests/harness/fourslash/runner.js +5 -5
- package/dist/tests/harness/fourslash/runner.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +20 -5
- package/dist/tests/harness/fourslash/testState.js +11 -26
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/harness/fourslash/testStateUtils.js +2 -0
- package/dist/tests/harness/fourslash/testStateUtils.js.map +1 -1
- package/dist/tests/harness/testAccessHost.d.ts +3 -1
- package/dist/tests/harness/testAccessHost.js +6 -2
- package/dist/tests/harness/testAccessHost.js.map +1 -1
- package/dist/tests/harness/testHost.js +20 -18
- package/dist/tests/harness/testHost.js.map +1 -1
- package/dist/tests/harness/vfs/factory.js +4 -1
- package/dist/tests/harness/vfs/factory.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +8 -1
- package/dist/tests/harness/vfs/filesystem.js +84 -30
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/hoverProvider.test.js +290 -0
- package/dist/tests/hoverProvider.test.js.map +1 -1
- package/dist/tests/importResolverSupport.test.d.ts +1 -0
- package/dist/tests/importResolverSupport.test.js +319 -0
- package/dist/tests/importResolverSupport.test.js.map +1 -0
- package/dist/tests/importStatementUtils.test.js +66 -0
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/lsp/{webpack.testserver.config.d.ts → rspack.testserver.config.d.ts} +1 -1
- package/dist/tests/lsp/{webpack.testserver.config.js → rspack.testserver.config.js} +4 -11
- package/dist/tests/lsp/rspack.testserver.config.js.map +1 -0
- package/dist/tests/realTempFile.test.d.ts +1 -0
- package/dist/tests/realTempFile.test.js +144 -0
- package/dist/tests/realTempFile.test.js.map +1 -0
- package/dist/tests/service.test.js +182 -3
- package/dist/tests/service.test.js.map +1 -1
- package/dist/tests/signatureHelp.test.js +391 -6
- package/dist/tests/signatureHelp.test.js.map +1 -1
- package/dist/tests/testState.test.js +19 -0
- package/dist/tests/testState.test.js.map +1 -1
- package/dist/tests/tokenizer.test.js +42 -0
- package/dist/tests/tokenizer.test.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +4 -0
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +12 -0
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +8 -1
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator6.test.js +7 -0
- package/dist/tests/typeEvaluator6.test.js.map +1 -1
- package/dist/tests/typeEvaluator8.test.js +13 -1
- package/dist/tests/typeEvaluator8.test.js.map +1 -1
- package/dist/tests/uri.test.js +29 -0
- package/dist/tests/uri.test.js.map +1 -1
- package/dist/tests/wildcardImportPackageMerge.test.d.ts +1 -0
- package/dist/tests/wildcardImportPackageMerge.test.js +97 -0
- package/dist/tests/wildcardImportPackageMerge.test.js.map +1 -0
- package/dist/tests/workspaceEditUtils.test.js +0 -1
- package/dist/tests/workspaceEditUtils.test.js.map +1 -1
- package/package.json +12 -11
- package/dist/tests/lsp/webpack.testserver.config.js.map +0 -1
|
@@ -12,7 +12,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
const assert_1 = __importDefault(require("assert"));
|
|
14
14
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
15
|
-
const positionUtils_1 = require("../common/positionUtils");
|
|
16
15
|
const signatureHelpProvider_1 = require("../languageService/signatureHelpProvider");
|
|
17
16
|
const testState_1 = require("./harness/fourslash/testState");
|
|
18
17
|
const docStringService_1 = require("../common/docStringService");
|
|
@@ -54,6 +53,390 @@ test('nested call in format string segment', () => {
|
|
|
54
53
|
`;
|
|
55
54
|
checkSignatureHelp(code, true);
|
|
56
55
|
});
|
|
56
|
+
test('signature help shows source default values for stub ellipsis defaults', () => {
|
|
57
|
+
const code = `
|
|
58
|
+
// @filename: pyrightconfig.json
|
|
59
|
+
//// {
|
|
60
|
+
//// "useLibraryCodeForTypes": true
|
|
61
|
+
//// }
|
|
62
|
+
|
|
63
|
+
// @filename: test.py
|
|
64
|
+
//// import mylib
|
|
65
|
+
////
|
|
66
|
+
//// mylib.f([|/*marker*/|]
|
|
67
|
+
|
|
68
|
+
// @filename: mylib.pyi
|
|
69
|
+
//// def f(a: int, b: str = ...) -> None: ...
|
|
70
|
+
|
|
71
|
+
// @filename: mylib.py
|
|
72
|
+
//// def f(a: int, b: int = 3) -> None:
|
|
73
|
+
//// ...
|
|
74
|
+
`;
|
|
75
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
76
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
77
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
78
|
+
assert_1.default.strictEqual(actual.signatures.length, 1, 'Expected one signature');
|
|
79
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int, b: str = 3) -> None');
|
|
80
|
+
});
|
|
81
|
+
test('signature help substitutes multiple stub ellipsis defaults from source', () => {
|
|
82
|
+
const code = `
|
|
83
|
+
// @filename: pyrightconfig.json
|
|
84
|
+
//// {
|
|
85
|
+
//// "useLibraryCodeForTypes": true
|
|
86
|
+
//// }
|
|
87
|
+
|
|
88
|
+
// @filename: test.py
|
|
89
|
+
//// import mylib
|
|
90
|
+
////
|
|
91
|
+
//// mylib.f([|/*marker*/|]
|
|
92
|
+
|
|
93
|
+
// @filename: mylib.pyi
|
|
94
|
+
//// def f(a: int = ..., b: str = ...) -> None: ...
|
|
95
|
+
|
|
96
|
+
// @filename: mylib.py
|
|
97
|
+
//// def f(a: int = 3, b: str = "hello") -> None:
|
|
98
|
+
//// ...
|
|
99
|
+
`;
|
|
100
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
101
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
102
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
103
|
+
assert_1.default.strictEqual(actual.signatures.length, 1, 'Expected one signature');
|
|
104
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int = 3, b: str = "hello") -> None');
|
|
105
|
+
});
|
|
106
|
+
test('signature help shows concrete default values when provided by stub', () => {
|
|
107
|
+
const code = `
|
|
108
|
+
// @filename: pyrightconfig.json
|
|
109
|
+
//// {
|
|
110
|
+
//// "useLibraryCodeForTypes": true
|
|
111
|
+
//// }
|
|
112
|
+
|
|
113
|
+
// @filename: test.py
|
|
114
|
+
//// import mylib
|
|
115
|
+
////
|
|
116
|
+
//// mylib.f([|/*marker*/|]
|
|
117
|
+
|
|
118
|
+
// @filename: mylib.pyi
|
|
119
|
+
//// def f(a: int = 3, b: str = "hello") -> None: ...
|
|
120
|
+
`;
|
|
121
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
122
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
123
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
124
|
+
assert_1.default.strictEqual(actual.signatures.length, 1, 'Expected one signature');
|
|
125
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int = 3, b: str = "hello") -> None');
|
|
126
|
+
});
|
|
127
|
+
test('signature help substitutes stub ellipsis defaults for all overloads', () => {
|
|
128
|
+
const code = `
|
|
129
|
+
// @filename: pyrightconfig.json
|
|
130
|
+
//// {
|
|
131
|
+
//// "useLibraryCodeForTypes": true
|
|
132
|
+
//// }
|
|
133
|
+
|
|
134
|
+
// @filename: test.py
|
|
135
|
+
//// import mylib
|
|
136
|
+
////
|
|
137
|
+
//// mylib.f(1, [|/*marker*/|])
|
|
138
|
+
|
|
139
|
+
// @filename: mylib.pyi
|
|
140
|
+
//// from typing import overload
|
|
141
|
+
////
|
|
142
|
+
//// @overload
|
|
143
|
+
//// def f(a: int = ..., b: str = ...) -> None: ...
|
|
144
|
+
////
|
|
145
|
+
//// @overload
|
|
146
|
+
//// def f(a: str = ..., b: str = ...) -> None: ...
|
|
147
|
+
////
|
|
148
|
+
//// def f(*args, **kwargs) -> None: ...
|
|
149
|
+
|
|
150
|
+
// @filename: mylib.py
|
|
151
|
+
//// def f(a: int = 3, b: str = "hello") -> None:
|
|
152
|
+
//// ...
|
|
153
|
+
`;
|
|
154
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
155
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
156
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
157
|
+
// Python runtime has a single implementation, so source defaults apply to all overloads.
|
|
158
|
+
assert_1.default.strictEqual(actual.activeSignature, 0);
|
|
159
|
+
assert_1.default.strictEqual(actual.signatures.length, 2);
|
|
160
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int = 3, b: str = "hello") -> None');
|
|
161
|
+
assert_1.default.strictEqual(actual.signatures[1].label, '(a: str = 3, b: str = "hello") -> None');
|
|
162
|
+
});
|
|
163
|
+
test('signature help does not substitute when stub default is not ellipsis', () => {
|
|
164
|
+
const code = `
|
|
165
|
+
// @filename: pyrightconfig.json
|
|
166
|
+
//// {
|
|
167
|
+
//// "useLibraryCodeForTypes": true
|
|
168
|
+
//// }
|
|
169
|
+
|
|
170
|
+
// @filename: test.py
|
|
171
|
+
//// import mylib
|
|
172
|
+
////
|
|
173
|
+
//// mylib.f([|/*marker*/|]
|
|
174
|
+
|
|
175
|
+
// @filename: mylib.pyi
|
|
176
|
+
//// def f(a: int, b: str = 1) -> None: ...
|
|
177
|
+
|
|
178
|
+
// @filename: mylib.py
|
|
179
|
+
//// def f(a: int, b: int = 3) -> None:
|
|
180
|
+
//// ...
|
|
181
|
+
`;
|
|
182
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
183
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
184
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
185
|
+
assert_1.default.strictEqual(actual.signatures.length, 1, 'Expected one signature');
|
|
186
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int, b: str = 1) -> None');
|
|
187
|
+
});
|
|
188
|
+
test('signature help does not substitute when source implementation is missing', () => {
|
|
189
|
+
const code = `
|
|
190
|
+
// @filename: pyrightconfig.json
|
|
191
|
+
//// {
|
|
192
|
+
//// "useLibraryCodeForTypes": true
|
|
193
|
+
//// }
|
|
194
|
+
|
|
195
|
+
// @filename: test.py
|
|
196
|
+
//// import mylib
|
|
197
|
+
////
|
|
198
|
+
//// mylib.f([|/*marker*/|]
|
|
199
|
+
|
|
200
|
+
// @filename: mylib.pyi
|
|
201
|
+
//// def f(a: int, b: str = ...) -> None: ...
|
|
202
|
+
`;
|
|
203
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
204
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
205
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
206
|
+
assert_1.default.strictEqual(actual.signatures.length, 1, 'Expected one signature');
|
|
207
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int, b: str = ...) -> None');
|
|
208
|
+
});
|
|
209
|
+
test('signature help does not substitute unsafe long defaults for stub ellipsis defaults', () => {
|
|
210
|
+
const longNumber = '9'.repeat(150);
|
|
211
|
+
const code = `
|
|
212
|
+
// @filename: pyrightconfig.json
|
|
213
|
+
//// {
|
|
214
|
+
//// "useLibraryCodeForTypes": true
|
|
215
|
+
//// }
|
|
216
|
+
|
|
217
|
+
// @filename: test.py
|
|
218
|
+
//// import mylib
|
|
219
|
+
////
|
|
220
|
+
//// mylib.f([|/*marker*/|]
|
|
221
|
+
|
|
222
|
+
// @filename: mylib.pyi
|
|
223
|
+
//// def f(a: int, b: str = ...) -> None: ...
|
|
224
|
+
|
|
225
|
+
// @filename: mylib.py
|
|
226
|
+
//// def f(a: int, b: int = ${longNumber}) -> None:
|
|
227
|
+
//// ...
|
|
228
|
+
`;
|
|
229
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
230
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
231
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
232
|
+
assert_1.default.strictEqual(actual.signatures.length, 1, 'Expected one signature');
|
|
233
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int, b: str = ...) -> None');
|
|
234
|
+
});
|
|
235
|
+
test('signature help does not substitute unsafe multiline defaults for stub ellipsis defaults', () => {
|
|
236
|
+
const code = `
|
|
237
|
+
// @filename: pyrightconfig.json
|
|
238
|
+
//// {
|
|
239
|
+
//// "useLibraryCodeForTypes": true
|
|
240
|
+
//// }
|
|
241
|
+
|
|
242
|
+
// @filename: test.py
|
|
243
|
+
//// import mylib
|
|
244
|
+
////
|
|
245
|
+
//// mylib.f([|/*marker*/|]
|
|
246
|
+
|
|
247
|
+
// @filename: mylib.pyi
|
|
248
|
+
//// def f(a: int, b: str = ...) -> None: ...
|
|
249
|
+
|
|
250
|
+
// @filename: mylib.py
|
|
251
|
+
//// def f(a: int, b: int = """hello
|
|
252
|
+
//// world""") -> None:
|
|
253
|
+
//// ...
|
|
254
|
+
`;
|
|
255
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
256
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
257
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
258
|
+
assert_1.default.strictEqual(actual.signatures.length, 1, 'Expected one signature');
|
|
259
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int, b: str = ...) -> None');
|
|
260
|
+
});
|
|
261
|
+
test('signature help overloads: mixed ellipsis and concrete defaults', () => {
|
|
262
|
+
const code = `
|
|
263
|
+
// @filename: pyrightconfig.json
|
|
264
|
+
//// {
|
|
265
|
+
//// "useLibraryCodeForTypes": true
|
|
266
|
+
//// }
|
|
267
|
+
|
|
268
|
+
// @filename: test.py
|
|
269
|
+
//// import mylib
|
|
270
|
+
////
|
|
271
|
+
//// mylib.f([|/*marker*/|])
|
|
272
|
+
|
|
273
|
+
// @filename: mylib.pyi
|
|
274
|
+
//// from typing import overload
|
|
275
|
+
////
|
|
276
|
+
//// @overload
|
|
277
|
+
//// def f(a: int, b: str = ...) -> None: ...
|
|
278
|
+
////
|
|
279
|
+
//// @overload
|
|
280
|
+
//// def f(a: int, b: str = "default") -> None: ...
|
|
281
|
+
////
|
|
282
|
+
//// def f(*args, **kwargs) -> None: ...
|
|
283
|
+
|
|
284
|
+
// @filename: mylib.py
|
|
285
|
+
//// def f(a: int, b: str = "hello") -> None:
|
|
286
|
+
//// ...
|
|
287
|
+
`;
|
|
288
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
289
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
290
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
291
|
+
assert_1.default.strictEqual(actual.signatures.length, 2);
|
|
292
|
+
// First overload: ellipsis substituted from source
|
|
293
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int, b: str = "hello") -> None');
|
|
294
|
+
// Second overload: concrete default kept as-is (not ellipsis, no substitution)
|
|
295
|
+
assert_1.default.strictEqual(actual.signatures[1].label, '(a: int, b: str = "default") -> None');
|
|
296
|
+
});
|
|
297
|
+
test('signature help overloads: overload with no defaults stays unchanged', () => {
|
|
298
|
+
const code = `
|
|
299
|
+
// @filename: pyrightconfig.json
|
|
300
|
+
//// {
|
|
301
|
+
//// "useLibraryCodeForTypes": true
|
|
302
|
+
//// }
|
|
303
|
+
|
|
304
|
+
// @filename: test.py
|
|
305
|
+
//// import mylib
|
|
306
|
+
////
|
|
307
|
+
//// mylib.f([|/*marker*/|])
|
|
308
|
+
|
|
309
|
+
// @filename: mylib.pyi
|
|
310
|
+
//// from typing import overload
|
|
311
|
+
////
|
|
312
|
+
//// @overload
|
|
313
|
+
//// def f(a: int) -> None: ...
|
|
314
|
+
////
|
|
315
|
+
//// @overload
|
|
316
|
+
//// def f(a: int, b: str = ...) -> None: ...
|
|
317
|
+
////
|
|
318
|
+
//// def f(*args, **kwargs) -> None: ...
|
|
319
|
+
|
|
320
|
+
// @filename: mylib.py
|
|
321
|
+
//// def f(a: int, b: str = "hello") -> None:
|
|
322
|
+
//// ...
|
|
323
|
+
`;
|
|
324
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
325
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
326
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
327
|
+
assert_1.default.strictEqual(actual.signatures.length, 2);
|
|
328
|
+
// First overload: no default parameter, stays unchanged
|
|
329
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int) -> None');
|
|
330
|
+
// Second overload: ellipsis substituted from source
|
|
331
|
+
assert_1.default.strictEqual(actual.signatures[1].label, '(a: int, b: str = "hello") -> None');
|
|
332
|
+
});
|
|
333
|
+
test('signature help overloads: param name not in source keeps ellipsis', () => {
|
|
334
|
+
const code = `
|
|
335
|
+
// @filename: pyrightconfig.json
|
|
336
|
+
//// {
|
|
337
|
+
//// "useLibraryCodeForTypes": true
|
|
338
|
+
//// }
|
|
339
|
+
|
|
340
|
+
// @filename: test.py
|
|
341
|
+
//// import mylib
|
|
342
|
+
////
|
|
343
|
+
//// mylib.f([|/*marker*/|])
|
|
344
|
+
|
|
345
|
+
// @filename: mylib.pyi
|
|
346
|
+
//// from typing import overload
|
|
347
|
+
////
|
|
348
|
+
//// @overload
|
|
349
|
+
//// def f(a: int, b: str = ...) -> None: ...
|
|
350
|
+
////
|
|
351
|
+
//// @overload
|
|
352
|
+
//// def f(a: int, x: str = ...) -> None: ...
|
|
353
|
+
////
|
|
354
|
+
//// def f(*args, **kwargs) -> None: ...
|
|
355
|
+
|
|
356
|
+
// @filename: mylib.py
|
|
357
|
+
//// def f(a: int, b: str = "hello") -> None:
|
|
358
|
+
//// ...
|
|
359
|
+
`;
|
|
360
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
361
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
362
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
363
|
+
assert_1.default.strictEqual(actual.signatures.length, 2);
|
|
364
|
+
// First overload: 'b' found in source, substituted
|
|
365
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int, b: str = "hello") -> None');
|
|
366
|
+
// Second overload: 'x' not in source, keeps ellipsis
|
|
367
|
+
assert_1.default.strictEqual(actual.signatures[1].label, '(a: int, x: str = ...) -> None');
|
|
368
|
+
});
|
|
369
|
+
test('signature help overloads: source uses *args/**kwargs, no substitution', () => {
|
|
370
|
+
const code = `
|
|
371
|
+
// @filename: pyrightconfig.json
|
|
372
|
+
//// {
|
|
373
|
+
//// "useLibraryCodeForTypes": true
|
|
374
|
+
//// }
|
|
375
|
+
|
|
376
|
+
// @filename: test.py
|
|
377
|
+
//// import mylib
|
|
378
|
+
////
|
|
379
|
+
//// mylib.f([|/*marker*/|])
|
|
380
|
+
|
|
381
|
+
// @filename: mylib.pyi
|
|
382
|
+
//// from typing import overload
|
|
383
|
+
////
|
|
384
|
+
//// @overload
|
|
385
|
+
//// def f(a: int = ...) -> None: ...
|
|
386
|
+
////
|
|
387
|
+
//// @overload
|
|
388
|
+
//// def f(a: str = ...) -> None: ...
|
|
389
|
+
////
|
|
390
|
+
//// def f(*args, **kwargs) -> None: ...
|
|
391
|
+
|
|
392
|
+
// @filename: mylib.py
|
|
393
|
+
//// def f(*args, **kwargs) -> None:
|
|
394
|
+
//// ...
|
|
395
|
+
`;
|
|
396
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
397
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
398
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
399
|
+
assert_1.default.strictEqual(actual.signatures.length, 2);
|
|
400
|
+
// Source has no named params with defaults, so ellipsis stays
|
|
401
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int = ...) -> None');
|
|
402
|
+
assert_1.default.strictEqual(actual.signatures[1].label, '(a: str = ...) -> None');
|
|
403
|
+
});
|
|
404
|
+
test('signature help overloads: different param counts, extra params keep ellipsis', () => {
|
|
405
|
+
const code = `
|
|
406
|
+
// @filename: pyrightconfig.json
|
|
407
|
+
//// {
|
|
408
|
+
//// "useLibraryCodeForTypes": true
|
|
409
|
+
//// }
|
|
410
|
+
|
|
411
|
+
// @filename: test.py
|
|
412
|
+
//// import mylib
|
|
413
|
+
////
|
|
414
|
+
//// mylib.f([|/*marker*/|])
|
|
415
|
+
|
|
416
|
+
// @filename: mylib.pyi
|
|
417
|
+
//// from typing import overload
|
|
418
|
+
////
|
|
419
|
+
//// @overload
|
|
420
|
+
//// def f(a: int = ..., b: str = ..., c: float = ...) -> None: ...
|
|
421
|
+
////
|
|
422
|
+
//// @overload
|
|
423
|
+
//// def f(a: int = ...) -> None: ...
|
|
424
|
+
////
|
|
425
|
+
//// def f(*args, **kwargs) -> None: ...
|
|
426
|
+
|
|
427
|
+
// @filename: mylib.py
|
|
428
|
+
//// def f(a: int = 1, b: str = "hi") -> None:
|
|
429
|
+
//// ...
|
|
430
|
+
`;
|
|
431
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
432
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
433
|
+
(0, assert_1.default)(actual, 'Expected signature help result');
|
|
434
|
+
assert_1.default.strictEqual(actual.signatures.length, 2);
|
|
435
|
+
// First overload: a and b substituted, c not in source keeps ellipsis
|
|
436
|
+
assert_1.default.strictEqual(actual.signatures[0].label, '(a: int = 1, b: str = "hi", c: float = ...) -> None');
|
|
437
|
+
// Second overload: a substituted
|
|
438
|
+
assert_1.default.strictEqual(actual.signatures[1].label, '(a: int = 1) -> None');
|
|
439
|
+
});
|
|
57
440
|
test('within arguments in format string segment', () => {
|
|
58
441
|
const code = `
|
|
59
442
|
// @filename: test.py
|
|
@@ -66,13 +449,15 @@ test('within arguments in format string segment', () => {
|
|
|
66
449
|
});
|
|
67
450
|
function checkSignatureHelp(code, expects) {
|
|
68
451
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
69
|
-
const
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
452
|
+
const actual = getSignatureHelpForMarker(state, 'marker');
|
|
453
|
+
assert_1.default.strictEqual(!!actual, expects);
|
|
454
|
+
}
|
|
455
|
+
function getSignatureHelpForMarker(state, markerName) {
|
|
456
|
+
const marker = state.getMarkerByName(markerName);
|
|
457
|
+
const position = state.getPosition(markerName);
|
|
458
|
+
return new signatureHelpProvider_1.SignatureHelpProvider(state.workspace.service.test_program, marker.fileUri, position, vscode_languageserver_1.MarkupKind.Markdown,
|
|
73
459
|
/*hasSignatureLabelOffsetCapability*/ true,
|
|
74
460
|
/*hasActiveParameterCapability*/ true,
|
|
75
461
|
/*context*/ undefined, new docStringService_1.PyrightDocStringService(), vscode_languageserver_1.CancellationToken.None).getSignatureHelp();
|
|
76
|
-
assert_1.default.strictEqual(!!actual, expects);
|
|
77
462
|
}
|
|
78
463
|
//# sourceMappingURL=signatureHelp.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signatureHelp.test.js","sourceRoot":"","sources":["../../../../../src/tests/signatureHelp.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAEH,oDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"signatureHelp.test.js","sourceRoot":"","sources":["../../../../../src/tests/signatureHelp.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -147,6 +147,25 @@ test('stubPath configuration', () => {
|
|
|
147
147
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
148
148
|
assert_1.default.equal(state.configOptions.stubPath?.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/src/typestubs'));
|
|
149
149
|
});
|
|
150
|
+
test('pyrightconfig.json exists in VFS', () => {
|
|
151
|
+
// Regression test: pyrightconfig.json should be written to the virtual file system,
|
|
152
|
+
// not just parsed for config options.
|
|
153
|
+
const code = `
|
|
154
|
+
// @filename: pyrightconfig.json
|
|
155
|
+
//// {
|
|
156
|
+
//// "stubPath": "my_stubs"
|
|
157
|
+
//// }
|
|
158
|
+
|
|
159
|
+
// @filename: test.py
|
|
160
|
+
//// x = 1
|
|
161
|
+
`;
|
|
162
|
+
const state = (0, testState_1.parseAndGetTestState)(code, factory.srcFolder).state;
|
|
163
|
+
// The pyrightconfig.json file should exist in the VFS
|
|
164
|
+
const configUri = uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'pyrightconfig.json')), state.serviceProvider);
|
|
165
|
+
(0, assert_1.default)(state.fs.existsSync(configUri), `pyrightconfig.json should exist in VFS at ${configUri.toString()}`);
|
|
166
|
+
// The config should also be parsed correctly
|
|
167
|
+
assert_1.default.equal(state.configOptions.stubPath?.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/my_stubs'));
|
|
168
|
+
});
|
|
150
169
|
test('Duplicated stubPath configuration', () => {
|
|
151
170
|
const code = `
|
|
152
171
|
// @filename: pyrightconfig.json
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testState.test.js","sourceRoot":"","sources":["../../../../../src/tests/testState.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"testState.test.js","sourceRoot":"","sources":["../../../../../src/tests/testState.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1253,6 +1253,23 @@ test('Floating point numbers with operators', () => {
|
|
|
1253
1253
|
assert_1.default.equal(results.tokens.contains(18), true);
|
|
1254
1254
|
assert_1.default.equal(results.tokens.contains(19), false);
|
|
1255
1255
|
});
|
|
1256
|
+
test('Floating point numbers with underscores', () => {
|
|
1257
|
+
const t = new tokenizer_1.Tokenizer();
|
|
1258
|
+
const results = t.tokenize('20_000.0 1_000.5 1_0.3e1_0');
|
|
1259
|
+
assert_1.default.equal(results.tokens.count, 3 + _implicitTokenCount);
|
|
1260
|
+
assert_1.default.equal(results.tokens.getItemAt(0).type, 6 /* TokenType.Number */);
|
|
1261
|
+
assert_1.default.equal(results.tokens.getItemAt(0).value, 20000.0);
|
|
1262
|
+
assert_1.default.equal(results.tokens.getItemAt(0).isInteger, false);
|
|
1263
|
+
assert_1.default.equal(results.tokens.getItemAt(0).length, 8);
|
|
1264
|
+
assert_1.default.equal(results.tokens.getItemAt(1).type, 6 /* TokenType.Number */);
|
|
1265
|
+
assert_1.default.equal(results.tokens.getItemAt(1).value, 1000.5);
|
|
1266
|
+
assert_1.default.equal(results.tokens.getItemAt(1).isInteger, false);
|
|
1267
|
+
assert_1.default.equal(results.tokens.getItemAt(1).length, 7);
|
|
1268
|
+
assert_1.default.equal(results.tokens.getItemAt(2).type, 6 /* TokenType.Number */);
|
|
1269
|
+
assert_1.default.equal(results.tokens.getItemAt(2).value, 10.3e10);
|
|
1270
|
+
assert_1.default.equal(results.tokens.getItemAt(2).isInteger, false);
|
|
1271
|
+
assert_1.default.equal(results.tokens.getItemAt(2).length, 9);
|
|
1272
|
+
});
|
|
1256
1273
|
test('Imaginary numbers', () => {
|
|
1257
1274
|
const t = new tokenizer_1.Tokenizer();
|
|
1258
1275
|
const results = t.tokenize('88.9j/100.0J*4.0e-5j-2.0j,');
|
|
@@ -1507,6 +1524,31 @@ test('TypeIgnoreLine2', () => {
|
|
|
1507
1524
|
assert_1.default.equal(results.tokens.contains(41), true);
|
|
1508
1525
|
assert_1.default.equal(results.tokens.contains(42), false);
|
|
1509
1526
|
});
|
|
1527
|
+
// Regression test for https://github.com/microsoft/pyright/issues/11345.
|
|
1528
|
+
// type: ignore comments containing tool-namespaced codes (e.g. "ty:rule-name")
|
|
1529
|
+
// must be recognised as type: ignore comments.
|
|
1530
|
+
test('TypeIgnoreNamespacedCode', () => {
|
|
1531
|
+
const t = new tokenizer_1.Tokenizer();
|
|
1532
|
+
// Single namespaced code.
|
|
1533
|
+
const results = t.tokenize('a = 1 # type: ignore[ty:unresolved-reference]');
|
|
1534
|
+
assert_1.default.equal(results.typeIgnoreLines.size, 1);
|
|
1535
|
+
(0, assert_1.default)(results.typeIgnoreLines.has(0));
|
|
1536
|
+
const rules = results.typeIgnoreLines.get(0).rulesList;
|
|
1537
|
+
(0, assert_1.default)(rules !== undefined);
|
|
1538
|
+
assert_1.default.equal(rules.length, 1);
|
|
1539
|
+
assert_1.default.equal(rules[0].text, 'ty:unresolved-reference');
|
|
1540
|
+
});
|
|
1541
|
+
test('TypeIgnoreMixedNamespacedCodes', () => {
|
|
1542
|
+
const t = new tokenizer_1.Tokenizer();
|
|
1543
|
+
// Mix of plain and namespaced codes.
|
|
1544
|
+
const results = t.tokenize('a = 1 # type: ignore[name-defined, ty:unresolved-reference]');
|
|
1545
|
+
assert_1.default.equal(results.typeIgnoreLines.size, 1);
|
|
1546
|
+
const rules = results.typeIgnoreLines.get(0).rulesList;
|
|
1547
|
+
(0, assert_1.default)(rules !== undefined);
|
|
1548
|
+
assert_1.default.equal(rules.length, 2);
|
|
1549
|
+
assert_1.default.equal(rules[0].text, 'name-defined');
|
|
1550
|
+
assert_1.default.equal(rules[1].text, 'ty:unresolved-reference');
|
|
1551
|
+
});
|
|
1510
1552
|
test('Constructor', () => {
|
|
1511
1553
|
const t = new tokenizer_1.Tokenizer();
|
|
1512
1554
|
const results = t.tokenize('def constructor');
|