@zzzen/pyright-internal 1.2.0-dev.20230305 → 1.2.0-dev.20230319
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 +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
- package/dist/analyzer/binder.js +23 -3
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cacheManager.d.ts +4 -0
- package/dist/analyzer/cacheManager.js +13 -0
- package/dist/analyzer/cacheManager.js.map +1 -1
- package/dist/analyzer/checker.d.ts +2 -1
- package/dist/analyzer/checker.js +73 -29
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.js +17 -11
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/commentUtils.js +11 -1
- package/dist/analyzer/commentUtils.js.map +1 -1
- package/dist/analyzer/constructorTransform.d.ts +1 -0
- package/dist/analyzer/constructorTransform.js +19 -2
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +40 -40
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/patternMatching.js +13 -11
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +1 -1
- package/dist/analyzer/program.js +21 -19
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.js +0 -1
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/service.d.ts +2 -1
- package/dist/analyzer/service.js +9 -3
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +2 -2
- package/dist/analyzer/sourceFile.js +14 -3
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.d.ts +1 -0
- package/dist/analyzer/sourceFileInfoUtils.js +17 -1
- package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +195 -87
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +1 -2
- package/dist/analyzer/typeEvaluatorTypes.js +0 -3
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typePrinter.js +63 -55
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeStubWriter.js +2 -0
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +1 -0
- package/dist/analyzer/typeUtils.js +29 -3
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.d.ts +2 -1
- package/dist/analyzer/typedDicts.js +84 -40
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +5 -1
- package/dist/analyzer/types.js +11 -1
- package/dist/analyzer/types.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +82 -4
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/commands/quickActionCommand.js +2 -2
- package/dist/commands/quickActionCommand.js.map +1 -1
- package/dist/common/configOptions.d.ts +1 -0
- package/dist/common/configOptions.js +4 -0
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/console.d.ts +1 -0
- package/dist/common/console.js +19 -1
- package/dist/common/console.js.map +1 -1
- package/dist/common/diagnosticRules.d.ts +2 -1
- package/dist/common/diagnosticRules.js +1 -0
- package/dist/common/diagnosticRules.js.map +1 -1
- package/dist/common/extensibility.d.ts +2 -2
- package/dist/common/extensibility.js +25 -1
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/extensions.js +3 -1
- package/dist/common/extensions.js.map +1 -1
- package/dist/languageServerBase.d.ts +21 -46
- package/dist/languageServerBase.js +112 -152
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/analyzerServiceExecutor.d.ts +4 -3
- package/dist/languageService/analyzerServiceExecutor.js +9 -7
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/codeActionProvider.d.ts +2 -2
- package/dist/languageService/codeActionProvider.js +4 -4
- package/dist/languageService/codeActionProvider.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +4 -2
- package/dist/languageService/completionProvider.js +209 -156
- 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.d.ts +2 -1
- package/dist/languageService/documentSymbolCollector.js +23 -2
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/hoverProvider.d.ts +2 -1
- package/dist/languageService/hoverProvider.js +21 -5
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/referencesProvider.d.ts +3 -2
- package/dist/languageService/referencesProvider.js +4 -4
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/renameModuleProvider.d.ts +1 -1
- package/dist/languageService/renameModuleProvider.js +8 -1
- package/dist/languageService/renameModuleProvider.js.map +1 -1
- package/dist/languageService/tooltipUtils.js +2 -1
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/localization/localize.d.ts +17 -6
- package/dist/localization/localize.js +6 -4
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.en-us.json +8 -6
- package/dist/parser/parser.js +24 -7
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/tokenizer.js +1 -1
- package/dist/server.d.ts +3 -2
- package/dist/server.js +1 -4
- package/dist/server.js.map +1 -1
- package/dist/tests/cacheManager.test.d.ts +1 -0
- package/dist/tests/cacheManager.test.js +69 -0
- package/dist/tests/cacheManager.test.js.map +1 -0
- package/dist/tests/checker.test.js +2 -2
- package/dist/tests/completions.test.js +445 -0
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/fourslash/completions.dictionary.keys.expression.fourslash.js +13 -3
- package/dist/tests/fourslash/completions.dictionary.keys.expression.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.dictionary.keys.stringLiterals.fourslash.js +7 -2
- package/dist/tests/fourslash/completions.dictionary.keys.stringLiterals.fourslash.js.map +1 -1
- package/dist/tests/fourslash/missingTypeStub.command.trycatchImport.fourslash.d.ts +7 -0
- package/dist/tests/fourslash/missingTypeStub.command.trycatchImport.fourslash.js +45 -0
- package/dist/tests/fourslash/missingTypeStub.command.trycatchImport.fourslash.js.map +1 -0
- package/dist/tests/harness/fourslash/testLanguageService.d.ts +7 -6
- package/dist/tests/harness/fourslash/testLanguageService.js +14 -13
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +5 -4
- package/dist/tests/harness/fourslash/testState.js +14 -13
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/hoverProvider.test.js +1 -1
- package/dist/tests/hoverProvider.test.js.map +1 -1
- package/dist/tests/moveSymbol.misc.test.js +27 -0
- package/dist/tests/moveSymbol.misc.test.js.map +1 -1
- package/dist/tests/service.test.js +4 -4
- package/dist/tests/service.test.js.map +1 -1
- package/dist/tests/signatureHelp.test.js +2 -2
- package/dist/tests/signatureHelp.test.js.map +1 -1
- package/dist/tests/sourceFile.test.js +3 -3
- package/dist/tests/sourceFile.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 +6 -2
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +1 -1
- package/dist/tests/typeEvaluator4.test.js +5 -1
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +12 -0
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/workspaceEditUtils.test.js +2 -2
- package/dist/tests/workspaceEditUtils.test.js.map +1 -1
- package/dist/workspaceFactory.d.ts +72 -0
- package/dist/workspaceFactory.js +421 -0
- package/dist/workspaceFactory.js.map +1 -0
- package/package.json +4 -4
- package/dist/workspaceMap.d.ts +0 -14
- package/dist/workspaceMap.js +0 -172
- package/dist/workspaceMap.js.map +0 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"completions.test.js","sourceRoot":"","sources":["../../../src/tests/completions.test.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"completions.test.js","sourceRoot":"","sources":["../../../src/tests/completions.test.ts"],"names":[],"mappings":"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"}
|
@@ -15,7 +15,7 @@
|
|
15
15
|
// @filename: dict_expression_partial_expression.py
|
16
16
|
//// d = { "key" : 1 }
|
17
17
|
//// d["key2"] = 1
|
18
|
-
//// d[key/*marker4
|
18
|
+
//// d[[|key/*marker4*/|]]
|
19
19
|
// @filename: dict_expression_complex_key.py
|
20
20
|
//// class C:
|
21
21
|
//// key = "name"
|
@@ -46,8 +46,18 @@
|
|
46
46
|
},
|
47
47
|
marker4: {
|
48
48
|
completions: [
|
49
|
-
{
|
50
|
-
|
49
|
+
{
|
50
|
+
label: '"key"',
|
51
|
+
kind: Consts.CompletionItemKind.Constant,
|
52
|
+
textEdit: { range: helper.getPositionRange('marker4'), newText: '"key"' },
|
53
|
+
detail: 'Dictionary key',
|
54
|
+
},
|
55
|
+
{
|
56
|
+
label: '"key2"',
|
57
|
+
kind: Consts.CompletionItemKind.Constant,
|
58
|
+
textEdit: { range: helper.getPositionRange('marker4'), newText: '"key2"' },
|
59
|
+
detail: 'Dictionary key',
|
60
|
+
},
|
51
61
|
],
|
52
62
|
},
|
53
63
|
marker5: {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"completions.dictionary.keys.expression.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/completions.dictionary.keys.expression.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,uCAAuC;AACvC,iBAAiB;AACjB,aAAa;AACb,mBAAmB;AAEnB,sCAAsC;AACtC,sBAAsB;AACtB,kBAAkB;AAClB,mBAAmB;AAEnB,+CAA+C;AAC/C,qBAAqB;AACrB,iBAAiB;AACjB,mBAAmB;AAEnB,mDAAmD;AACnD,sBAAsB;AACtB,kBAAkB;AAClB,
|
1
|
+
{"version":3,"file":"completions.dictionary.keys.expression.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/completions.dictionary.keys.expression.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,uCAAuC;AACvC,iBAAiB;AACjB,aAAa;AACb,mBAAmB;AAEnB,sCAAsC;AACtC,sBAAsB;AACtB,kBAAkB;AAClB,mBAAmB;AAEnB,+CAA+C;AAC/C,qBAAqB;AACrB,iBAAiB;AACjB,mBAAmB;AAEnB,mDAAmD;AACnD,sBAAsB;AACtB,kBAAkB;AAClB,0BAA0B;AAE1B,4CAA4C;AAC5C,aAAa;AACb,qBAAqB;AACrB,IAAI;AACJ,sBAAsB;AACtB,sBAAsB;AAEtB;IACI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE7D,aAAa;IACb,MAAM,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE;QAClD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE;gBAClF,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE;aACrF;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE;gBACvF,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE;aAC1F;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE;gBACtF,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE;aACzF;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE;oBACzE,MAAM,EAAE,gBAAgB;iBAC3B;gBACD;oBACI,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE;oBAC1E,MAAM,EAAE,gBAAgB;iBAC3B;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;SACxG;KACJ,CAAC,CAAC;CACN"}
|
@@ -20,7 +20,7 @@
|
|
20
20
|
// @filename: dict_key_name_conflicts.py
|
21
21
|
//// keyString = "key"
|
22
22
|
//// d = dict(keyString=1)
|
23
|
-
//// d[keyStr
|
23
|
+
//// d[[|keyStr/*marker6*/|]]
|
24
24
|
// @filename: dict_key_mixed_literals.py
|
25
25
|
//// d = { "key": 1, 1 + 2: 1 }
|
26
26
|
//// d[[|/*marker7*/|]]
|
@@ -86,7 +86,12 @@
|
|
86
86
|
marker6: {
|
87
87
|
completions: [
|
88
88
|
{ label: 'keyString', kind: Consts.CompletionItemKind.Variable },
|
89
|
-
{
|
89
|
+
{
|
90
|
+
label: '"keyString"',
|
91
|
+
kind: Consts.CompletionItemKind.Constant,
|
92
|
+
textEdit: { range: helper.getPositionRange('marker6'), newText: '"keyString"' },
|
93
|
+
detail: 'Dictionary key',
|
94
|
+
},
|
90
95
|
],
|
91
96
|
},
|
92
97
|
marker7: {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"completions.dictionary.keys.stringLiterals.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/completions.dictionary.keys.stringLiterals.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,gCAAgC;AAChC,sBAAsB;AACtB,yBAAyB;AAEzB,iCAAiC;AACjC,oBAAoB;AACpB,yBAAyB;AAEzB,gCAAgC;AAChC,qBAAqB;AACrB,wBAAwB;AAExB,iCAAiC;AACjC,oBAAoB;AACpB,0BAA0B;AAE1B,4CAA4C;AAC5C,iBAAiB;AACjB,oBAAoB;AACpB,kBAAkB;AAClB,uBAAuB;AAEvB,wCAAwC;AACxC,sBAAsB;AACtB,0BAA0B;AAC1B,6BAA6B;AAE7B,wCAAwC;AACxC,+BAA+B;AAC/B,uBAAuB;AAEvB;IACI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE7D,aAAa;IACb,MAAM,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE;QAC/C,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE;oBACzE,MAAM,EAAE,gBAAgB;iBAC3B;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE;oBACzE,MAAM,EAAE,gBAAgB;iBAC3B;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE;oBACzE,MAAM,EAAE,gBAAgB;iBAC3B;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE;oBACzE,MAAM,EAAE,gBAAgB;iBAC3B;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,MAAM;oBACb,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,MAAM,EAAE,gBAAgB;iBAC3B;gBACD;oBACI,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE;oBAC1E,MAAM,EAAE,gBAAgB;iBAC3B;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE;gBAChE,
|
1
|
+
{"version":3,"file":"completions.dictionary.keys.stringLiterals.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/completions.dictionary.keys.stringLiterals.fourslash.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,45 @@
|
|
1
|
+
"use strict";
|
2
|
+
/// <reference path="fourslash.ts" />
|
3
|
+
// @filename: pyrightconfig.json
|
4
|
+
//// {
|
5
|
+
//// "reportMissingTypeStubs": "warning"
|
6
|
+
//// }
|
7
|
+
// @filename: testLib/mylibrary.py
|
8
|
+
// @library: true
|
9
|
+
//// # This is a library file
|
10
|
+
//// class MyLibrary:
|
11
|
+
//// def DoEveryThing(self, code: str):
|
12
|
+
//// ...
|
13
|
+
//// class ExceptLibrary:
|
14
|
+
//// def DoEveryThing(self, code: str):
|
15
|
+
//// ...
|
16
|
+
//// class ElseLibrary:
|
17
|
+
//// def DoEveryThing(self, code: str):
|
18
|
+
//// ...
|
19
|
+
// @filename: testLib/__init__.py
|
20
|
+
// @library: true
|
21
|
+
//// try:
|
22
|
+
//// from .mylibrary import MyLibrary
|
23
|
+
//// except:
|
24
|
+
//// from .mylibrary import ExceptLibrary
|
25
|
+
//// else:
|
26
|
+
//// from .mylibrary import ElseLibrary
|
27
|
+
// @filename: test.py
|
28
|
+
//// import [|/*marker*/testLi|]b
|
29
|
+
const filename4 = helper.getMarkerByName('marker').fileName;
|
30
|
+
const command4 = {
|
31
|
+
title: 'Create Type Stub',
|
32
|
+
command: Consts.Commands.createTypeStub,
|
33
|
+
arguments: ['/', 'testLib', filename4],
|
34
|
+
};
|
35
|
+
// @ts-ignore
|
36
|
+
await helper.verifyCommand(command4, {
|
37
|
+
['/typings/testLib/__init__.pyi']: `"""
|
38
|
+
This type stub file was generated by pyright.
|
39
|
+
"""
|
40
|
+
|
41
|
+
from .mylibrary import MyLibrary
|
42
|
+
|
43
|
+
`,
|
44
|
+
});
|
45
|
+
//# sourceMappingURL=missingTypeStub.command.trycatchImport.fourslash.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"missingTypeStub.command.trycatchImport.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/missingTypeStub.command.trycatchImport.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,gCAAgC;AAChC,MAAM;AACN,0CAA0C;AAC1C,MAAM;AAEN,kCAAkC;AAClC,iBAAiB;AACjB,6BAA6B;AAC7B,qBAAqB;AACrB,2CAA2C;AAC3C,gBAAgB;AAChB,yBAAyB;AACzB,2CAA2C;AAC3C,gBAAgB;AAChB,uBAAuB;AACvB,2CAA2C;AAC3C,gBAAgB;AAEhB,iCAAiC;AACjC,iBAAiB;AACjB,SAAS;AACT,yCAAyC;AACzC,YAAY;AACZ,6CAA6C;AAC7C,UAAU;AACV,2CAA2C;AAE3C,qBAAqB;AACrB,iCAAiC;AAEjC,MAAM,SAAS,GAAG,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;AAC5D,MAAM,QAAQ,GAAG;IACb,KAAK,EAAE,kBAAkB;IACzB,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,cAAc;IACvC,SAAS,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC;CACzC,CAAC;AAEF,aAAa;AACb,MAAM,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE;IACjC,CAAC,+BAA+B,CAAC,EAAE;;;;;;CAMtC;CACA,CAAC,CAAC"}
|
@@ -5,13 +5,14 @@ import { BackgroundAnalysisBase } from '../../../backgroundAnalysisBase';
|
|
5
5
|
import { ConsoleInterface } from '../../../common/console';
|
6
6
|
import { FileSystem } from '../../../common/fileSystem';
|
7
7
|
import { Range } from '../../../common/textRange';
|
8
|
-
import { LanguageServerInterface, MessageAction, ServerSettings, WindowInterface
|
8
|
+
import { LanguageServerInterface, MessageAction, ServerSettings, WindowInterface } from '../../../languageServerBase';
|
9
|
+
import { Workspace } from '../../../workspaceFactory';
|
9
10
|
import { HostSpecificFeatures } from './testState';
|
10
11
|
export declare class TestFeatures implements HostSpecificFeatures {
|
11
12
|
importResolverFactory: ImportResolverFactory;
|
12
13
|
backgroundAnalysisProgramFactory: BackgroundAnalysisProgramFactory;
|
13
|
-
runIndexer(workspace:
|
14
|
-
getCodeActionsForPosition(workspace:
|
14
|
+
runIndexer(workspace: Workspace, noStdLib: boolean, options?: string): void;
|
15
|
+
getCodeActionsForPosition(workspace: Workspace, filePath: string, range: Range, token: CancellationToken): Promise<CodeAction[]>;
|
15
16
|
execute(ls: LanguageServerInterface, params: ExecuteCommandParams, token: CancellationToken): Promise<any>;
|
16
17
|
}
|
17
18
|
export declare class TestLanguageService implements LanguageServerInterface {
|
@@ -20,10 +21,10 @@ export declare class TestLanguageService implements LanguageServerInterface {
|
|
20
21
|
private readonly _workspace;
|
21
22
|
private readonly _defaultWorkspace;
|
22
23
|
private readonly _uriParser;
|
23
|
-
constructor(workspace:
|
24
|
+
constructor(workspace: Workspace, console: ConsoleInterface, fs: FileSystem);
|
24
25
|
decodeTextDocumentUri(uriString: string): string;
|
25
|
-
getWorkspaceForFile(filePath: string): Promise<
|
26
|
-
getSettings(
|
26
|
+
getWorkspaceForFile(filePath: string): Promise<Workspace>;
|
27
|
+
getSettings(_workspace: Workspace): Promise<ServerSettings>;
|
27
28
|
createBackgroundAnalysis(serviceId: string): BackgroundAnalysisBase | undefined;
|
28
29
|
reanalyze(): void;
|
29
30
|
restart(): void;
|
@@ -34,8 +34,8 @@ const commandController_1 = require("../../../commands/commandController");
|
|
34
34
|
const configOptions_1 = require("../../../common/configOptions");
|
35
35
|
const debug = __importStar(require("../../../common/debug"));
|
36
36
|
const uriParser_1 = require("../../../common/uriParser");
|
37
|
-
const languageServerBase_1 = require("../../../languageServerBase");
|
38
37
|
const codeActionProvider_1 = require("../../../languageService/codeActionProvider");
|
38
|
+
const workspaceFactory_1 = require("../../../workspaceFactory");
|
39
39
|
const testAccessHost_1 = require("../testAccessHost");
|
40
40
|
class TestFeatures {
|
41
41
|
constructor() {
|
@@ -67,10 +67,11 @@ class TestLanguageService {
|
|
67
67
|
this._defaultWorkspace = {
|
68
68
|
workspaceName: '',
|
69
69
|
rootPath: '',
|
70
|
-
path: '',
|
71
70
|
uri: '',
|
72
|
-
|
73
|
-
|
71
|
+
pythonPath: undefined,
|
72
|
+
pythonPathKind: workspaceFactory_1.WorkspacePythonPathKind.Mutable,
|
73
|
+
kinds: [workspaceFactory_1.WellKnownWorkspaceKinds.Test],
|
74
|
+
service: new service_1.AnalyzerService('test service', this.fs, {
|
74
75
|
console: this.console,
|
75
76
|
hostFactory: () => new testAccessHost_1.TestAccessHost(),
|
76
77
|
importResolverFactory: service_1.AnalyzerService.createImportResolver,
|
@@ -79,7 +80,7 @@ class TestLanguageService {
|
|
79
80
|
disableLanguageServices: false,
|
80
81
|
disableOrganizeImports: false,
|
81
82
|
disableWorkspaceSymbol: false,
|
82
|
-
isInitialized: (0,
|
83
|
+
isInitialized: (0, workspaceFactory_1.createInitStatus)(),
|
83
84
|
searchPathsToWatch: [],
|
84
85
|
};
|
85
86
|
}
|
@@ -92,16 +93,16 @@ class TestLanguageService {
|
|
92
93
|
}
|
93
94
|
return Promise.resolve(this._defaultWorkspace);
|
94
95
|
}
|
95
|
-
getSettings(
|
96
|
+
getSettings(_workspace) {
|
96
97
|
const settings = {
|
97
|
-
venvPath: this._workspace.
|
98
|
-
pythonPath: this._workspace.
|
99
|
-
typeshedPath: this._workspace.
|
100
|
-
openFilesOnly: this._workspace.
|
101
|
-
useLibraryCodeForTypes: this._workspace.
|
98
|
+
venvPath: this._workspace.service.getConfigOptions().venvPath,
|
99
|
+
pythonPath: this._workspace.service.getConfigOptions().pythonPath,
|
100
|
+
typeshedPath: this._workspace.service.getConfigOptions().typeshedPath,
|
101
|
+
openFilesOnly: this._workspace.service.getConfigOptions().checkOnlyOpenFiles,
|
102
|
+
useLibraryCodeForTypes: this._workspace.service.getConfigOptions().useLibraryCodeForTypes,
|
102
103
|
disableLanguageServices: this._workspace.disableLanguageServices,
|
103
|
-
autoImportCompletions: this._workspace.
|
104
|
-
functionSignatureDisplay: this._workspace.
|
104
|
+
autoImportCompletions: this._workspace.service.getConfigOptions().autoImportCompletions,
|
105
|
+
functionSignatureDisplay: this._workspace.service.getConfigOptions().functionSignatureDisplay,
|
105
106
|
};
|
106
107
|
return Promise.resolve(settings);
|
107
108
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"testLanguageService.js","sourceRoot":"","sources":["../../../../../src/tests/harness/fourslash/testLanguageService.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;AAEH,2CAA6B;AAG7B,2FAGqD;AAIrD,uDAA4D;AAE5D,2EAAwE;AACxE,iEAA8D;AAE9D,6DAA+C;AAG/C,yDAAsD;
|
1
|
+
{"version":3,"file":"testLanguageService.js","sourceRoot":"","sources":["../../../../../src/tests/harness/fourslash/testLanguageService.ts"],"names":[],"mappings":"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"}
|
@@ -6,11 +6,12 @@ import { ConfigOptions } from '../../../common/configOptions';
|
|
6
6
|
import { ConsoleInterface } from '../../../common/console';
|
7
7
|
import { FileEditAction } from '../../../common/editAction';
|
8
8
|
import { DocumentRange, Position, Range as PositionRange, TextRange } from '../../../common/textRange';
|
9
|
-
import { LanguageServerInterface
|
9
|
+
import { LanguageServerInterface } from '../../../languageServerBase';
|
10
10
|
import { AbbreviationInfo } from '../../../languageService/autoImporter';
|
11
11
|
import { DefinitionFilter } from '../../../languageService/definitionProvider';
|
12
12
|
import { ParseNode } from '../../../parser/parseNodes';
|
13
13
|
import { PyrightFileSystem } from '../../../pyrightFileSystem';
|
14
|
+
import { Workspace } from '../../../workspaceFactory';
|
14
15
|
import * as vfs from '../vfs/filesystem';
|
15
16
|
import { FourSlashData, FourSlashFile, Marker, MultiMap, Range } from './fourSlashTypes';
|
16
17
|
export interface TextChange {
|
@@ -20,8 +21,8 @@ export interface TextChange {
|
|
20
21
|
export interface HostSpecificFeatures {
|
21
22
|
importResolverFactory: ImportResolverFactory;
|
22
23
|
backgroundAnalysisProgramFactory: BackgroundAnalysisProgramFactory;
|
23
|
-
runIndexer(workspace:
|
24
|
-
getCodeActionsForPosition(workspace:
|
24
|
+
runIndexer(workspace: Workspace, noStdLib: boolean, options?: string): void;
|
25
|
+
getCodeActionsForPosition(workspace: Workspace, filePath: string, range: PositionRange, token: CancellationToken): Promise<CodeAction[]>;
|
25
26
|
execute(ls: LanguageServerInterface, params: ExecuteCommandParams, token: CancellationToken): Promise<any>;
|
26
27
|
}
|
27
28
|
export declare class TestState {
|
@@ -31,7 +32,7 @@ export declare class TestState {
|
|
31
32
|
private readonly _hostSpecificFeatures;
|
32
33
|
readonly testFS: vfs.TestFileSystem;
|
33
34
|
readonly fs: PyrightFileSystem;
|
34
|
-
readonly workspace:
|
35
|
+
readonly workspace: Workspace;
|
35
36
|
readonly console: ConsoleInterface;
|
36
37
|
readonly rawConfigJson: any | undefined;
|
37
38
|
currentCaretPosition: number;
|
@@ -45,11 +45,11 @@ const debug = __importStar(require("../../../common/debug"));
|
|
45
45
|
const pathUtils_1 = require("../../../common/pathUtils");
|
46
46
|
const positionUtils_1 = require("../../../common/positionUtils");
|
47
47
|
const textRange_1 = require("../../../common/textRange");
|
48
|
-
const languageServerBase_1 = require("../../../languageServerBase");
|
49
48
|
const definitionProvider_1 = require("../../../languageService/definitionProvider");
|
50
49
|
const hoverProvider_1 = require("../../../languageService/hoverProvider");
|
51
50
|
const tokenizer_1 = require("../../../parser/tokenizer");
|
52
51
|
const pyrightFileSystem_1 = require("../../../pyrightFileSystem");
|
52
|
+
const workspaceFactory_1 = require("../../../workspaceFactory");
|
53
53
|
const testAccessHost_1 = require("../testAccessHost");
|
54
54
|
const host = __importStar(require("../testHost"));
|
55
55
|
const utils_1 = require("../utils");
|
@@ -89,14 +89,15 @@ class TestState {
|
|
89
89
|
this.workspace = {
|
90
90
|
workspaceName: 'test workspace',
|
91
91
|
rootPath: vfsInfo.projectRoot,
|
92
|
-
|
92
|
+
pythonPath: undefined,
|
93
|
+
pythonPathKind: workspaceFactory_1.WorkspacePythonPathKind.Mutable,
|
93
94
|
uri: (0, pathUtils_1.convertPathToUri)(this.fs, vfsInfo.projectRoot),
|
94
|
-
kinds: [
|
95
|
-
|
95
|
+
kinds: [workspaceFactory_1.WellKnownWorkspaceKinds.Test],
|
96
|
+
service: service,
|
96
97
|
disableLanguageServices: false,
|
97
98
|
disableOrganizeImports: false,
|
98
99
|
disableWorkspaceSymbol: false,
|
99
|
-
isInitialized: (0,
|
100
|
+
isInitialized: (0, workspaceFactory_1.createInitStatus)(),
|
100
101
|
searchPathsToWatch: [],
|
101
102
|
};
|
102
103
|
const indexer = (0, core_1.toBoolean)(testData.globalOptions["indexer" /* indexer */]);
|
@@ -118,16 +119,16 @@ class TestState {
|
|
118
119
|
}
|
119
120
|
}
|
120
121
|
get importResolver() {
|
121
|
-
return this.workspace.
|
122
|
+
return this.workspace.service.getImportResolver();
|
122
123
|
}
|
123
124
|
get configOptions() {
|
124
|
-
return this.workspace.
|
125
|
+
return this.workspace.service.getConfigOptions();
|
125
126
|
}
|
126
127
|
get program() {
|
127
|
-
return this.workspace.
|
128
|
+
return this.workspace.service.test_program;
|
128
129
|
}
|
129
130
|
dispose() {
|
130
|
-
this.workspace.
|
131
|
+
this.workspace.service.dispose();
|
131
132
|
}
|
132
133
|
cwd() {
|
133
134
|
return this.testFS.cwd();
|
@@ -451,7 +452,7 @@ class TestState {
|
|
451
452
|
}
|
452
453
|
async verifyCodeActions(map, verifyCodeActionCount) {
|
453
454
|
// make sure we don't use cache built from other tests
|
454
|
-
this.workspace.
|
455
|
+
this.workspace.service.invalidateAndForceReanalysis();
|
455
456
|
this.analyze();
|
456
457
|
for (const range of this.getRanges()) {
|
457
458
|
const name = this.getMarkerName(range.marker);
|
@@ -639,7 +640,7 @@ class TestState {
|
|
639
640
|
includeUserSymbolsInAutoImport: false,
|
640
641
|
};
|
641
642
|
const nameMap = abbrMap ? new Map(Object.entries(abbrMap)) : undefined;
|
642
|
-
const result = await this.workspace.
|
643
|
+
const result = await this.workspace.service.getCompletionsForPosition(filePath, completionPosition, this.workspace.rootPath, options, nameMap, vscode_languageserver_1.CancellationToken.None);
|
643
644
|
if (result) {
|
644
645
|
if (verifyMode === 'exact') {
|
645
646
|
if (result.completionList.items.length !== expectedCompletions.length) {
|
@@ -662,13 +663,13 @@ class TestState {
|
|
662
663
|
const actual = result.completionList.items[actualIndex];
|
663
664
|
if (expected.additionalTextEdits !== undefined) {
|
664
665
|
if (actual.additionalTextEdits === undefined) {
|
665
|
-
this.workspace.
|
666
|
+
this.workspace.service.resolveCompletionItem(filePath, actual, options, nameMap, vscode_languageserver_1.CancellationToken.None);
|
666
667
|
}
|
667
668
|
}
|
668
669
|
this.verifyCompletionItem(expected, actual);
|
669
670
|
if (expected.documentation !== undefined) {
|
670
671
|
if (actual.documentation === undefined && actual.data) {
|
671
|
-
this.workspace.
|
672
|
+
this.workspace.service.resolveCompletionItem(filePath, actual, options, nameMap, vscode_languageserver_1.CancellationToken.None);
|
672
673
|
}
|
673
674
|
if (vscode_languageserver_1.MarkupContent.is(actual.documentation)) {
|
674
675
|
assert_1.default.strictEqual(actual.documentation.value, expected.documentation);
|