@zzzen/pyright-internal 1.2.0-dev.20230423 → 1.2.0-dev.20230507
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 +4 -1
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.d.ts +7 -4
- package/dist/analyzer/backgroundAnalysisProgram.js +22 -7
- package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
- package/dist/analyzer/binder.js +12 -7
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.d.ts +1 -0
- package/dist/analyzer/checker.js +58 -7
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/constructors.d.ts +6 -0
- package/dist/analyzer/constructors.js +456 -0
- package/dist/analyzer/constructors.js.map +1 -0
- package/dist/analyzer/dataClasses.js +89 -2
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declarationUtils.d.ts +6 -1
- package/dist/analyzer/declarationUtils.js +10 -8
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/enums.js +54 -8
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +15 -15
- package/dist/analyzer/importResolver.js +477 -477
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importStatementUtils.d.ts +2 -2
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.d.ts +1 -1
- package/dist/analyzer/namedTuples.js +30 -42
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.d.ts +16 -0
- package/dist/analyzer/operations.js +749 -0
- package/dist/analyzer/operations.js.map +1 -0
- package/dist/analyzer/packageTypeReport.d.ts +2 -1
- package/dist/analyzer/packageTypeReport.js +2 -1
- package/dist/analyzer/packageTypeReport.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.d.ts +1 -1
- package/dist/analyzer/packageTypeVerifier.js +27 -13
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +4 -2
- package/dist/analyzer/parseTreeUtils.js +32 -1
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +16 -0
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +29 -53
- package/dist/analyzer/program.js +1050 -1649
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/protocols.js +1 -1
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/service.d.ts +14 -35
- package/dist/analyzer/service.js +92 -121
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +14 -49
- package/dist/analyzer/sourceFile.js +271 -291
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.d.ts +2 -2
- package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +417 -1570
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +44 -9
- package/dist/analyzer/typeEvaluatorTypes.js +33 -1
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.js +5 -9
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +3 -0
- package/dist/analyzer/typeUtils.js +66 -9
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeVarContext.d.ts +5 -5
- package/dist/analyzer/typeVarContext.js +7 -0
- package/dist/analyzer/typeVarContext.js.map +1 -1
- package/dist/analyzer/typedDicts.js +2 -2
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +4 -2
- package/dist/analyzer/types.js +7 -0
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundAnalysisBase.d.ts +10 -11
- package/dist/backgroundAnalysisBase.js +87 -87
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +8 -8
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/commands/quickActionCommand.js +4 -1
- package/dist/commands/quickActionCommand.js.map +1 -1
- package/dist/common/cancellationUtils.d.ts +1 -1
- package/dist/common/cancellationUtils.js +9 -9
- package/dist/common/cancellationUtils.js.map +1 -1
- package/dist/common/commandLineOptions.d.ts +1 -2
- package/dist/common/commandLineOptions.js.map +1 -1
- package/dist/common/configOptions.d.ts +2 -2
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/console.d.ts +5 -9
- package/dist/common/console.js +46 -33
- package/dist/common/console.js.map +1 -1
- package/dist/common/deferred.js +10 -10
- package/dist/common/deferred.js.map +1 -1
- package/dist/common/extensibility.d.ts +27 -5
- package/dist/common/extensibility.js +1 -1
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/fileBasedCancellationUtils.js +5 -5
- package/dist/common/fileBasedCancellationUtils.js.map +1 -1
- package/dist/common/fileSystem.d.ts +12 -10
- package/dist/common/fileSystem.js.map +1 -1
- package/dist/common/fullAccessHost.d.ts +3 -3
- package/dist/common/fullAccessHost.js +6 -6
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/pathUtils.d.ts +13 -13
- package/dist/common/pathUtils.js.map +1 -1
- package/dist/common/realFileSystem.js +12 -7
- package/dist/common/realFileSystem.js.map +1 -1
- package/dist/common/uriParser.d.ts +2 -2
- package/dist/common/uriParser.js +3 -3
- package/dist/common/uriParser.js.map +1 -1
- package/dist/common/workspaceEditUtils.d.ts +5 -5
- package/dist/common/workspaceEditUtils.js +7 -4
- package/dist/common/workspaceEditUtils.js.map +1 -1
- package/dist/languageServerBase.d.ts +32 -31
- package/dist/languageServerBase.js +278 -345
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/analyzerServiceExecutor.js +0 -1
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.d.ts +16 -12
- package/dist/languageService/callHierarchyProvider.js +125 -41
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +10 -13
- package/dist/languageService/completionProvider.js +21 -10
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/definitionProvider.d.ts +23 -9
- package/dist/languageService/definitionProvider.js +116 -91
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentHighlightProvider.d.ts +8 -3
- package/dist/languageService/documentHighlightProvider.js +17 -6
- package/dist/languageService/documentHighlightProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.d.ts +6 -7
- package/dist/languageService/documentSymbolCollector.js +21 -11
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.js +5 -3
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/hoverProvider.d.ts +4 -3
- package/dist/languageService/hoverProvider.js +30 -36
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/navigationUtils.d.ts +6 -0
- package/dist/languageService/navigationUtils.js +28 -0
- package/dist/languageService/navigationUtils.js.map +1 -0
- package/dist/languageService/quickActions.d.ts +2 -2
- package/dist/languageService/quickActions.js +12 -1
- package/dist/languageService/quickActions.js.map +1 -1
- package/dist/languageService/referencesProvider.d.ts +13 -12
- package/dist/languageService/referencesProvider.js +102 -16
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/renameProvider.d.ts +17 -0
- package/dist/languageService/renameProvider.js +143 -0
- package/dist/languageService/renameProvider.js.map +1 -0
- package/dist/languageService/signatureHelpProvider.d.ts +19 -23
- package/dist/languageService/signatureHelpProvider.js +111 -18
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +17 -14
- package/dist/localization/localize.js +4 -6
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.en-us.json +5 -6
- package/dist/parser/characterStream.d.ts +3 -3
- package/dist/parser/characterStream.js +12 -12
- package/dist/parser/characterStream.js.map +1 -1
- package/dist/parser/parser.d.ts +1 -1
- package/dist/parser/parser.js.map +1 -1
- package/dist/pyright.js +57 -54
- package/dist/pyright.js.map +1 -1
- package/dist/pyrightFileSystem.d.ts +1 -1
- package/dist/pyrightFileSystem.js +21 -21
- package/dist/pyrightFileSystem.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.d.ts +6 -6
- package/dist/readonlyAugmentedFileSystem.js +28 -28
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/server.js +6 -6
- package/dist/server.js.map +1 -1
- package/dist/tests/chainedSourceFiles.test.js +1 -1
- package/dist/tests/chainedSourceFiles.test.js.map +1 -1
- package/dist/tests/checker.test.js +1 -1
- package/dist/tests/documentSymbolCollector.test.js +3 -3
- package/dist/tests/documentSymbolCollector.test.js.map +1 -1
- package/dist/tests/fourslash/fourslash.d.ts +4 -4
- package/dist/tests/fourslash/missingTypeStub.codeAction.fourslash.js +1 -1
- package/dist/tests/fourslash/missingTypeStub.codeAction.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.d.ts +3 -3
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +11 -11
- package/dist/tests/harness/fourslash/testState.js +123 -113
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +8 -8
- package/dist/tests/harness/vfs/filesystem.js +68 -68
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +34 -0
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/signatureHelp.test.js +5 -1
- package/dist/tests/signatureHelp.test.js.map +1 -1
- package/dist/tests/sourceFile.test.js +2 -2
- package/dist/tests/sourceFile.test.js.map +1 -1
- package/dist/tests/testStateUtils.d.ts +2 -2
- package/dist/tests/testStateUtils.js +39 -9
- package/dist/tests/testStateUtils.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +8 -0
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +13 -1
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +2 -2
- package/dist/tests/typeEvaluator4.test.js +9 -1
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +4 -0
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/workspaceEditUtils.test.js +84 -0
- package/dist/tests/workspaceEditUtils.test.js.map +1 -1
- package/package.json +4 -4
- package/dist/languageService/indentationUtils.d.ts +0 -16
- package/dist/languageService/indentationUtils.js +0 -727
- package/dist/languageService/indentationUtils.js.map +0 -1
- package/dist/languageService/insertionPointUtils.d.ts +0 -9
- package/dist/languageService/insertionPointUtils.js +0 -132
- package/dist/languageService/insertionPointUtils.js.map +0 -1
- package/dist/languageService/renameModuleProvider.d.ts +0 -65
- package/dist/languageService/renameModuleProvider.js +0 -939
- package/dist/languageService/renameModuleProvider.js.map +0 -1
- package/dist/tests/indentationUtils.ptvs.test.d.ts +0 -1
- package/dist/tests/indentationUtils.ptvs.test.js +0 -324
- package/dist/tests/indentationUtils.ptvs.test.js.map +0 -1
- package/dist/tests/indentationUtils.reindent.test.d.ts +0 -1
- package/dist/tests/indentationUtils.reindent.test.js +0 -372
- package/dist/tests/indentationUtils.reindent.test.js.map +0 -1
- package/dist/tests/indentationUtils.test.d.ts +0 -1
- package/dist/tests/indentationUtils.test.js +0 -502
- package/dist/tests/indentationUtils.test.js.map +0 -1
- package/dist/tests/insertionPointUtils.test.d.ts +0 -1
- package/dist/tests/insertionPointUtils.test.js +0 -154
- package/dist/tests/insertionPointUtils.test.js.map +0 -1
- package/dist/tests/moveSymbol.importAdder.test.d.ts +0 -1
- package/dist/tests/moveSymbol.importAdder.test.js +0 -298
- package/dist/tests/moveSymbol.importAdder.test.js.map +0 -1
- package/dist/tests/moveSymbol.insertion.test.d.ts +0 -1
- package/dist/tests/moveSymbol.insertion.test.js +0 -537
- package/dist/tests/moveSymbol.insertion.test.js.map +0 -1
- package/dist/tests/moveSymbol.misc.test.d.ts +0 -1
- package/dist/tests/moveSymbol.misc.test.js +0 -169
- package/dist/tests/moveSymbol.misc.test.js.map +0 -1
- package/dist/tests/moveSymbol.updateReference.test.d.ts +0 -1
- package/dist/tests/moveSymbol.updateReference.test.js +0 -1057
- package/dist/tests/moveSymbol.updateReference.test.js.map +0 -1
- package/dist/tests/renameModule.folder.test.d.ts +0 -1
- package/dist/tests/renameModule.folder.test.js +0 -229
- package/dist/tests/renameModule.folder.test.js.map +0 -1
- package/dist/tests/renameModule.fromImports.test.d.ts +0 -1
- package/dist/tests/renameModule.fromImports.test.js +0 -790
- package/dist/tests/renameModule.fromImports.test.js.map +0 -1
- package/dist/tests/renameModule.imports.test.d.ts +0 -1
- package/dist/tests/renameModule.imports.test.js +0 -380
- package/dist/tests/renameModule.imports.test.js.map +0 -1
- package/dist/tests/renameModule.misc.test.d.ts +0 -1
- package/dist/tests/renameModule.misc.test.js +0 -615
- package/dist/tests/renameModule.misc.test.js.map +0 -1
- package/dist/tests/renameModule.relativePath.test.d.ts +0 -1
- package/dist/tests/renameModule.relativePath.test.js +0 -231
- package/dist/tests/renameModule.relativePath.test.js.map +0 -1
- package/dist/tests/renameModuleTestUtils.d.ts +0 -4
- package/dist/tests/renameModuleTestUtils.js +0 -76
- package/dist/tests/renameModuleTestUtils.js.map +0 -1
@@ -1,298 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
/*
|
3
|
-
* moveSymbol.importAdder.test.ts
|
4
|
-
* Copyright (c) Microsoft Corporation.
|
5
|
-
* Licensed under the MIT license.
|
6
|
-
*
|
7
|
-
* importAdder tests around move symbol.
|
8
|
-
*/
|
9
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
10
|
-
const testState_1 = require("./harness/fourslash/testState");
|
11
|
-
const renameModuleTestUtils_1 = require("./renameModuleTestUtils");
|
12
|
-
test('move imports used in the symbol', () => {
|
13
|
-
const code = `
|
14
|
-
// @filename: test.py
|
15
|
-
//// [|{|"r":"!n!class MyType:!n! pass!n!!n!"|}from typing import List, Mapping
|
16
|
-
////
|
17
|
-
//// class MyType:
|
18
|
-
//// pass
|
19
|
-
////
|
20
|
-
//// def [|/*marker*/foo|](a: str, b: List[int]) -> None:
|
21
|
-
//// c: Mapping[str, MyType] = { 'hello', MyType() }|]
|
22
|
-
|
23
|
-
// @filename: moved.py
|
24
|
-
//// [|{|"r":"from test import MyType!n!!n!!n!from typing import List, Mapping!n!!n!!n!def foo(a: str, b: List[int]) -> None:!n! c: Mapping[str, MyType] = { 'hello', MyType() }", "name": "dest"|}|]
|
25
|
-
`;
|
26
|
-
testFromCode(code);
|
27
|
-
});
|
28
|
-
test('import with alias', () => {
|
29
|
-
const code = `
|
30
|
-
// @filename: test.py
|
31
|
-
//// [|{|"r":"!n!class MyType:!n! pass!n!!n!"|}from typing import List as l, Mapping as m
|
32
|
-
////
|
33
|
-
//// class MyType:
|
34
|
-
//// pass
|
35
|
-
////
|
36
|
-
//// def [|/*marker*/foo|](a: str, b: l[int]) -> None:
|
37
|
-
//// c: m[str, MyType] = { 'hello', MyType() }|]
|
38
|
-
|
39
|
-
// @filename: moved.py
|
40
|
-
//// [|{|"r":"from test import MyType!n!!n!!n!from typing import List as l, Mapping as m!n!!n!!n!def foo(a: str, b: l[int]) -> None:!n! c: m[str, MyType] = { 'hello', MyType() }", "name": "dest"|}|]
|
41
|
-
`;
|
42
|
-
testFromCode(code);
|
43
|
-
});
|
44
|
-
test('with existing imports', () => {
|
45
|
-
const code = `
|
46
|
-
// @filename: test.py
|
47
|
-
//// [|{|"r":"!n!class MyType:!n! pass!n!!n!"|}from typing import List, Mapping
|
48
|
-
////
|
49
|
-
//// class MyType:
|
50
|
-
//// pass
|
51
|
-
////
|
52
|
-
//// def [|/*marker*/foo|](a: str, b: List[int]) -> None:
|
53
|
-
//// c: Mapping[str, MyType] = { 'hello', MyType() }|]
|
54
|
-
|
55
|
-
// @filename: moved.py
|
56
|
-
//// from typing import List, Mapping
|
57
|
-
//// from test import MyType[|{|"r":"!n!!n!!n!def foo(a: str, b: List[int]) -> None:!n! c: Mapping[str, MyType] = { 'hello', MyType() }", "name": "dest"|}|]
|
58
|
-
`;
|
59
|
-
testFromCode(code);
|
60
|
-
});
|
61
|
-
test('merge with existing imports', () => {
|
62
|
-
const code = `
|
63
|
-
// @filename: test.py
|
64
|
-
//// [|{|"r":"!n!class MyType:!n! pass!n!!n!class MyType2(MyType):!n! pass!n!!n!"|}from typing import List, Mapping
|
65
|
-
////
|
66
|
-
//// class MyType:
|
67
|
-
//// pass
|
68
|
-
////
|
69
|
-
//// class MyType2(MyType):
|
70
|
-
//// pass
|
71
|
-
////
|
72
|
-
//// def [|/*marker*/foo|](a: str, b: List[int]) -> None:
|
73
|
-
//// c: Mapping[str, MyType] = { 'hello', MyType2() }|]
|
74
|
-
|
75
|
-
// @filename: moved.py
|
76
|
-
//// [|{|"r":"from typing import List, Mapping!n!from test import MyType, MyType2!n!m = MyType()!n!!n!!n!def foo(a: str, b: List[int]) -> None:!n! c: Mapping[str, MyType] = { 'hello', MyType2() }", "name": "dest"|}from typing import Mapping
|
77
|
-
//// from test import MyType
|
78
|
-
//// m = MyType()|]
|
79
|
-
`;
|
80
|
-
testFromCode(code);
|
81
|
-
});
|
82
|
-
test('merge with existing moving symbol imports', () => {
|
83
|
-
const code = `
|
84
|
-
// @filename: test.py
|
85
|
-
//// [|{|"r":"!n!class MyType:!n! pass!n!!n!"|}from typing import List, Mapping
|
86
|
-
////
|
87
|
-
//// class MyType:
|
88
|
-
//// pass
|
89
|
-
////
|
90
|
-
//// def [|/*marker*/foo|](a: str, b: List[int]) -> None:
|
91
|
-
//// c: Mapping[str, MyType] = { 'hello', MyType() }|]
|
92
|
-
|
93
|
-
// @filename: moved.py
|
94
|
-
//// from typing import List, Mapping
|
95
|
-
//// from test import [|{|"r":""|}foo, |]MyType[|{|"r":"!n!!n!!n!def foo(a: str, b: List[int]) -> None:!n! c: Mapping[str, MyType] = { 'hello', MyType() }", "name": "dest"|}|]
|
96
|
-
////
|
97
|
-
//// foo()
|
98
|
-
`;
|
99
|
-
testFromCode(code);
|
100
|
-
});
|
101
|
-
test('merge with existing moving symbol imports and add new one', () => {
|
102
|
-
const code = `
|
103
|
-
// @filename: test.py
|
104
|
-
//// [|{|"r":"!n!class MyType:!n! pass!n!!n!"|}from typing import List, Mapping
|
105
|
-
////
|
106
|
-
//// class MyType:
|
107
|
-
//// pass
|
108
|
-
////
|
109
|
-
//// def [|/*marker*/foo|](a: str, b: List[int]) -> None:
|
110
|
-
//// c: Mapping[str, MyType] = { 'hello', MyType() }|]
|
111
|
-
|
112
|
-
// @filename: moved.py
|
113
|
-
//// [|{|"r":"from typing import List, Mapping!n!!n!from test import MyType!n!!n!!n!def foo(a: str, b: List[int]) -> None:!n! c: Mapping[str, MyType] = { 'hello', MyType() }!n!!n!foo()", "name": "dest"|}from typing import List, Mapping
|
114
|
-
//// from test import foo
|
115
|
-
////
|
116
|
-
//// foo()|]
|
117
|
-
`;
|
118
|
-
testFromCode(code);
|
119
|
-
});
|
120
|
-
test('symbol from destination file used', () => {
|
121
|
-
const code = `
|
122
|
-
// @filename: test.py
|
123
|
-
//// [|{|"r":"!n!"|}from moved import MyType
|
124
|
-
////
|
125
|
-
//// def [|/*marker*/foo|](a: MyType) -> None:
|
126
|
-
//// c: Mapping[str, MyType] = { 'hello', a }|]
|
127
|
-
|
128
|
-
// @filename: moved.py
|
129
|
-
//// class MyType:
|
130
|
-
//// pass[|{|"r":"!n!!n!!n!def foo(a: MyType) -> None:!n! c: Mapping[str, MyType] = { 'hello', a }", "name": "dest"|}|]
|
131
|
-
////
|
132
|
-
`;
|
133
|
-
testFromCode(code);
|
134
|
-
});
|
135
|
-
test('insert after all symbols references', () => {
|
136
|
-
const code = `
|
137
|
-
// @filename: test.py
|
138
|
-
//// [|{|"r":"!n!"|}from moved import MyType
|
139
|
-
////
|
140
|
-
//// def [|/*marker*/foo|](a: MyType) -> None:
|
141
|
-
//// c: Mapping[str, MyType] = { 'hello', a }|]
|
142
|
-
|
143
|
-
// @filename: moved.py
|
144
|
-
//// [|{|"r":""|}from test import foo
|
145
|
-
//// |]
|
146
|
-
//// class MyType:
|
147
|
-
//// pass[|{|"r":"!n!!n!!n!def foo(a: MyType) -> None:!n! c: Mapping[str, MyType] = { 'hello', a }", "name": "dest"|}|]
|
148
|
-
////
|
149
|
-
//// foo()
|
150
|
-
`;
|
151
|
-
testFromCode(code);
|
152
|
-
});
|
153
|
-
test('insert after all symbols references 2', () => {
|
154
|
-
const code = `
|
155
|
-
// @filename: test.py
|
156
|
-
//// [|{|"r":"!n!"|}from moved import MyType
|
157
|
-
////
|
158
|
-
//// def [|/*marker*/foo|](a: MyType) -> None:
|
159
|
-
//// c: Mapping[str, MyType] = { 'hello', a }|]
|
160
|
-
|
161
|
-
// @filename: moved.py
|
162
|
-
//// def __privateFoo():
|
163
|
-
//// pass
|
164
|
-
////
|
165
|
-
//// class MyType:
|
166
|
-
//// pass[|{|"r":"!n!!n!!n!def foo(a: MyType) -> None:!n! c: Mapping[str, MyType] = { 'hello', a }", "name": "dest"|}|]
|
167
|
-
`;
|
168
|
-
testFromCode(code);
|
169
|
-
});
|
170
|
-
test('symbol used before all symbol references', () => {
|
171
|
-
const code = `
|
172
|
-
// @filename: test.py
|
173
|
-
//// [|{|"r":"!n!"|}from moved import MyType
|
174
|
-
////
|
175
|
-
//// def [|/*marker*/foo|](a: MyType) -> None:
|
176
|
-
//// c: Mapping[str, MyType] = { 'hello', a }|]
|
177
|
-
|
178
|
-
// @filename: moved.py
|
179
|
-
//// [|{|"r":""|}from test import foo[|{|"r":"!n!!n!!n!def foo(a: MyType) -> None:!n! c: Mapping[str, MyType] = { 'hello', a }", "name": "dest"|}|]
|
180
|
-
//// |]
|
181
|
-
//// foo()
|
182
|
-
////
|
183
|
-
//// class MyType:
|
184
|
-
//// pass
|
185
|
-
`;
|
186
|
-
testFromCode(code);
|
187
|
-
});
|
188
|
-
test('symbol with import statements', () => {
|
189
|
-
const code = `
|
190
|
-
// @filename: test.py
|
191
|
-
//// [|{|"r": "import sys!n!!n!"|}import os, os.path, sys
|
192
|
-
////
|
193
|
-
//// def [|/*marker*/foo|]():
|
194
|
-
//// p = os.path.curdir
|
195
|
-
//// os.abort()|]
|
196
|
-
|
197
|
-
// @filename: moved.py
|
198
|
-
//// [|{|"r": "import os!n!import os.path!n!!n!!n!def foo():!n! p = os.path.curdir!n! os.abort()", "name": "dest"|}|]
|
199
|
-
`;
|
200
|
-
testFromCode(code);
|
201
|
-
});
|
202
|
-
test('symbol with import statements with alias', () => {
|
203
|
-
const code = `
|
204
|
-
// @filename: test.py
|
205
|
-
//// [|{|"r": "import sys!n!!n!"|}import os, os.path as path, sys
|
206
|
-
////
|
207
|
-
//// def [|/*marker*/foo|]():
|
208
|
-
//// p = path.curdir
|
209
|
-
//// os.abort()|]
|
210
|
-
|
211
|
-
// @filename: moved.py
|
212
|
-
//// [|{|"r": "import os!n!import os.path as path!n!!n!!n!def foo():!n! p = path.curdir!n! os.abort()", "name": "dest"|}|]
|
213
|
-
`;
|
214
|
-
testFromCode(code);
|
215
|
-
});
|
216
|
-
test('symbol with import statements with alias 2', () => {
|
217
|
-
const code = `
|
218
|
-
// @filename: test.py
|
219
|
-
//// [|{|"r": "import sys!n!!n!"|}import os, os.path as p1, sys
|
220
|
-
////
|
221
|
-
//// def [|/*marker*/foo|]():
|
222
|
-
//// p = p1.curdir
|
223
|
-
//// os.abort()|]
|
224
|
-
|
225
|
-
// @filename: moved.py
|
226
|
-
//// [|{|"r": "import os!n!import os.path as p1!n!!n!!n!def foo():!n! p = p1.curdir!n! os.abort()", "name": "dest"|}|]
|
227
|
-
`;
|
228
|
-
testFromCode(code);
|
229
|
-
});
|
230
|
-
test('symbol with import statements with multiple unused imports', () => {
|
231
|
-
const code = `
|
232
|
-
// @filename: test.py
|
233
|
-
//// [|{|"r": "import os.path, sys!n!!n!"|}import os, os.path, sys
|
234
|
-
////
|
235
|
-
//// def [|/*marker*/foo|]():
|
236
|
-
//// os.abort()|]
|
237
|
-
|
238
|
-
// @filename: moved.py
|
239
|
-
//// [|{|"r": "import os!n!!n!!n!def foo():!n! os.abort()", "name": "dest"|}|]
|
240
|
-
`;
|
241
|
-
testFromCode(code);
|
242
|
-
});
|
243
|
-
test('symbol with import statements with used imports', () => {
|
244
|
-
const code = `
|
245
|
-
// @filename: test.py
|
246
|
-
//// [|{|"r": "import os.path as path, sys!n!!n!p = path.curdir!n!!n!"|}import os, os.path as path, sys
|
247
|
-
////
|
248
|
-
//// p = path.curdir
|
249
|
-
////
|
250
|
-
//// def [|/*marker*/foo|]():
|
251
|
-
//// p = path.curdir
|
252
|
-
//// os.abort()|]
|
253
|
-
|
254
|
-
// @filename: moved.py
|
255
|
-
//// [|{|"r": "import os!n!import os.path as path!n!!n!!n!def foo():!n! p = path.curdir!n! os.abort()", "name": "dest"|}|]
|
256
|
-
`;
|
257
|
-
testFromCode(code);
|
258
|
-
});
|
259
|
-
test('symbol with invalid import', () => {
|
260
|
-
const code = `
|
261
|
-
// @filename: test.py
|
262
|
-
//// import notExist
|
263
|
-
////
|
264
|
-
//// p = notExist.fooStr
|
265
|
-
////
|
266
|
-
//// [|{|"r": ""|}def [|/*marker*/foo|]():
|
267
|
-
//// p = notExist.fooStr|]
|
268
|
-
|
269
|
-
// @filename: moved.py
|
270
|
-
//// [|{|"r": "def foo():!n! p = notExist.fooStr", "name": "dest"|}|]
|
271
|
-
`;
|
272
|
-
testFromCode(code, true);
|
273
|
-
});
|
274
|
-
test('symbol with import with error', () => {
|
275
|
-
const code = `
|
276
|
-
// @filename: test.py
|
277
|
-
//// #pyright: strict
|
278
|
-
//// import lib # should have no stub diagnostic
|
279
|
-
////
|
280
|
-
//// lib.bar()
|
281
|
-
////
|
282
|
-
//// [|{|"r": ""|}def [|/*marker*/foo|]():
|
283
|
-
//// p = lib.bar()|]
|
284
|
-
|
285
|
-
// @filename: lib/__init__.py
|
286
|
-
// @library: true
|
287
|
-
//// def bar(): pass
|
288
|
-
|
289
|
-
// @filename: moved.py
|
290
|
-
//// [|{|"r": "import lib!n!!n!!n!def foo():!n! p = lib.bar()", "name": "dest"|}|]
|
291
|
-
`;
|
292
|
-
testFromCode(code, true);
|
293
|
-
});
|
294
|
-
function testFromCode(code, expectsMissingImport = false) {
|
295
|
-
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
296
|
-
(0, renameModuleTestUtils_1.testMoveSymbolAtPosition)(state, state.getMarkerByName('marker').fileName, state.getMarkerByName('dest').fileName, state.getPositionRange('marker').start, undefined, undefined, expectsMissingImport);
|
297
|
-
}
|
298
|
-
//# sourceMappingURL=moveSymbol.importAdder.test.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"moveSymbol.importAdder.test.js","sourceRoot":"","sources":["../../../src/tests/moveSymbol.importAdder.test.ts"],"names":[],"mappings":"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"}
|
@@ -1 +0,0 @@
|
|
1
|
-
export {};
|