@zzzen/pyright-internal 1.2.0-dev.20230115 → 1.2.0-dev.20230129

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.
Files changed (103) hide show
  1. package/dist/analyzer/binder.js +1 -1
  2. package/dist/analyzer/binder.js.map +1 -1
  3. package/dist/analyzer/checker.d.ts +1 -1
  4. package/dist/analyzer/checker.js +51 -38
  5. package/dist/analyzer/checker.js.map +1 -1
  6. package/dist/analyzer/constraintSolver.js +7 -6
  7. package/dist/analyzer/constraintSolver.js.map +1 -1
  8. package/dist/analyzer/enums.js +1 -1
  9. package/dist/analyzer/enums.js.map +1 -1
  10. package/dist/analyzer/importResolver.d.ts +2 -1
  11. package/dist/analyzer/importResolver.js +6 -1
  12. package/dist/analyzer/importResolver.js.map +1 -1
  13. package/dist/analyzer/importResult.d.ts +1 -0
  14. package/dist/analyzer/parseTreeUtils.d.ts +1 -0
  15. package/dist/analyzer/parseTreeUtils.js +70 -11
  16. package/dist/analyzer/parseTreeUtils.js.map +1 -1
  17. package/dist/analyzer/patternMatching.js +1 -1
  18. package/dist/analyzer/patternMatching.js.map +1 -1
  19. package/dist/analyzer/program.d.ts +3 -2
  20. package/dist/analyzer/program.js +19 -6
  21. package/dist/analyzer/program.js.map +1 -1
  22. package/dist/analyzer/regions.js +8 -12
  23. package/dist/analyzer/regions.js.map +1 -1
  24. package/dist/analyzer/service.js +1 -1
  25. package/dist/analyzer/service.js.map +1 -1
  26. package/dist/analyzer/sourceFile.d.ts +2 -2
  27. package/dist/analyzer/sourceFile.js +2 -2
  28. package/dist/analyzer/sourceFile.js.map +1 -1
  29. package/dist/analyzer/typeEvaluator.js +120 -24
  30. package/dist/analyzer/typeEvaluator.js.map +1 -1
  31. package/dist/analyzer/typeEvaluatorTypes.d.ts +0 -1
  32. package/dist/analyzer/typeGuards.js +5 -3
  33. package/dist/analyzer/typeGuards.js.map +1 -1
  34. package/dist/analyzer/typePrinter.js +32 -12
  35. package/dist/analyzer/typePrinter.js.map +1 -1
  36. package/dist/analyzer/typeUtils.d.ts +1 -0
  37. package/dist/analyzer/typeUtils.js +51 -4
  38. package/dist/analyzer/typeUtils.js.map +1 -1
  39. package/dist/analyzer/typedDicts.js +6 -2
  40. package/dist/analyzer/typedDicts.js.map +1 -1
  41. package/dist/analyzer/types.d.ts +5 -2
  42. package/dist/analyzer/types.js +29 -5
  43. package/dist/analyzer/types.js.map +1 -1
  44. package/dist/backgroundThreadBase.js +1 -0
  45. package/dist/backgroundThreadBase.js.map +1 -1
  46. package/dist/common/configOptions.d.ts +5 -0
  47. package/dist/common/configOptions.js +19 -1
  48. package/dist/common/configOptions.js.map +1 -1
  49. package/dist/common/envVarUtils.js +30 -7
  50. package/dist/common/envVarUtils.js.map +1 -1
  51. package/dist/languageServerBase.d.ts +2 -1
  52. package/dist/languageServerBase.js.map +1 -1
  53. package/dist/languageService/completionProvider.js +4 -11
  54. package/dist/languageService/completionProvider.js.map +1 -1
  55. package/dist/languageService/hoverProvider.d.ts +3 -1
  56. package/dist/languageService/hoverProvider.js +34 -32
  57. package/dist/languageService/hoverProvider.js.map +1 -1
  58. package/dist/languageService/indentationUtils.js +54 -43
  59. package/dist/languageService/indentationUtils.js.map +1 -1
  60. package/dist/languageService/tooltipUtils.d.ts +5 -1
  61. package/dist/languageService/tooltipUtils.js +60 -3
  62. package/dist/languageService/tooltipUtils.js.map +1 -1
  63. package/dist/localization/package.nls.en-us.json +1 -1
  64. package/dist/parser/parseNodes.js +0 -1
  65. package/dist/parser/parseNodes.js.map +1 -1
  66. package/dist/parser/stringTokenUtils.js +1 -1
  67. package/dist/parser/stringTokenUtils.js.map +1 -1
  68. package/dist/server.js +2 -0
  69. package/dist/server.js.map +1 -1
  70. package/dist/tests/fourslash/completions.commitChars.fourslash.js +23 -1
  71. package/dist/tests/fourslash/completions.commitChars.fourslash.js.map +1 -1
  72. package/dist/tests/fourslash/findDefinitions.namespaceImport.fourslash.js +2 -2
  73. package/dist/tests/fourslash/findDefinitions.namespaceImport.fourslash.js.map +1 -1
  74. package/dist/tests/fourslash/hover.formatted.fourslash.d.ts +1 -0
  75. package/dist/tests/fourslash/hover.formatted.fourslash.js +45 -0
  76. package/dist/tests/fourslash/hover.formatted.fourslash.js.map +1 -0
  77. package/dist/tests/fourslash/hover.overloadedFunction.fourslash.d.ts +1 -0
  78. package/dist/tests/fourslash/hover.overloadedFunction.fourslash.js +23 -0
  79. package/dist/tests/fourslash/hover.overloadedFunction.fourslash.js.map +1 -0
  80. package/dist/tests/harness/fourslash/testLanguageService.js +1 -0
  81. package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
  82. package/dist/tests/harness/fourslash/testState.d.ts +0 -10
  83. package/dist/tests/harness/fourslash/testState.js +15 -68
  84. package/dist/tests/harness/fourslash/testState.js.map +1 -1
  85. package/dist/tests/harness/fourslash/testStateUtils.d.ts +12 -0
  86. package/dist/tests/harness/fourslash/testStateUtils.js +98 -0
  87. package/dist/tests/harness/fourslash/testStateUtils.js.map +1 -0
  88. package/dist/tests/indentationUtils.test.js +51 -0
  89. package/dist/tests/indentationUtils.test.js.map +1 -1
  90. package/dist/tests/pathUtils.test.js +10 -0
  91. package/dist/tests/pathUtils.test.js.map +1 -1
  92. package/dist/tests/signatureHelp.test.d.ts +1 -0
  93. package/dist/tests/signatureHelp.test.js +73 -0
  94. package/dist/tests/signatureHelp.test.js.map +1 -0
  95. package/dist/tests/typeEvaluator1.test.js +12 -0
  96. package/dist/tests/typeEvaluator1.test.js.map +1 -1
  97. package/dist/tests/typeEvaluator2.test.js +4 -0
  98. package/dist/tests/typeEvaluator2.test.js.map +1 -1
  99. package/dist/tests/typeEvaluator3.test.js +9 -1
  100. package/dist/tests/typeEvaluator3.test.js.map +1 -1
  101. package/dist/tests/typeEvaluator4.test.js +10 -0
  102. package/dist/tests/typeEvaluator4.test.js.map +1 -1
  103. package/package.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"stringTokenUtils.js","sourceRoot":"","sources":["../../../src/parser/stringTokenUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stringTokenUtils.js","sourceRoot":"","sources":["../../../src/parser/stringTokenUtils.ts"],"names":[],"mappings":"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"}
package/dist/server.js CHANGED
@@ -12,6 +12,7 @@ const pythonPathUtils_1 = require("./analyzer/pythonPathUtils");
12
12
  const backgroundAnalysis_1 = require("./backgroundAnalysis");
13
13
  const commandController_1 = require("./commands/commandController");
14
14
  const cancellationUtils_1 = require("./common/cancellationUtils");
15
+ const configOptions_1 = require("./common/configOptions");
15
16
  const console_1 = require("./common/console");
16
17
  const core_1 = require("./common/core");
17
18
  const envVarUtils_1 = require("./common/envVarUtils");
@@ -61,6 +62,7 @@ class PyrightServer extends languageServerBase_1.LanguageServerBase {
61
62
  diagnosticSeverityOverrides: {},
62
63
  logLevel: console_1.LogLevel.Info,
63
64
  autoImportCompletions: true,
65
+ functionSignatureDisplay: configOptions_1.SignatureDisplayType.formatted,
64
66
  };
65
67
  try {
66
68
  const pythonSection = await this.getConfiguration(workspace.uri, 'python');
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,9 @@
6
6
  //// fooClass().foo[|/*marker2*/|]
7
7
  // @filename: test1.py
8
8
  //// from .samp[|/*marker3*/|]
9
+ // @filename: test2.py
10
+ //// from samples import *
11
+ //// [|/*marker4*/|]
9
12
  // @filename: samples.py
10
13
  //// import fooLib as fooLib
11
14
  //// def fooFunc(): ...
@@ -50,7 +53,26 @@
50
53
  {
51
54
  label: 'samples',
52
55
  kind: Consts.CompletionItemKind.Module,
53
- commitCharacters: undefined,
56
+ commitCharacters: [],
57
+ },
58
+ ],
59
+ },
60
+ marker4: {
61
+ completions: [
62
+ {
63
+ label: 'fooLib',
64
+ kind: Consts.CompletionItemKind.Module,
65
+ commitCharacters: [],
66
+ },
67
+ {
68
+ label: 'fooFunc',
69
+ kind: Consts.CompletionItemKind.Function,
70
+ commitCharacters: [],
71
+ },
72
+ {
73
+ label: 'fooClass',
74
+ kind: Consts.CompletionItemKind.Class,
75
+ commitCharacters: [],
54
76
  },
55
77
  ],
56
78
  },
@@ -1 +1 @@
1
- {"version":3,"file":"completions.commitChars.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/completions.commitChars.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,qBAAqB;AACrB,0BAA0B;AAC1B,uBAAuB;AACvB,kCAAkC;AAElC,sBAAsB;AACtB,8BAA8B;AAE9B,wBAAwB;AACxB,4BAA4B;AAC5B,uBAAuB;AACvB,sBAAsB;AACtB,iCAAiC;AAEjC,uBAAuB;AACvB,YAAY;AAEZ;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;oBACI,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM;oBACtC,gBAAgB,EAAE,CAAC,GAAG,CAAC;iBAC1B;gBACD;oBACI,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,gBAAgB,EAAE,CAAC,GAAG,CAAC;iBAC1B;gBACD;oBACI,KAAK,EAAE,UAAU;oBACjB,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,KAAK;oBACrC,gBAAgB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;iBAC/B;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,WAAW;oBAClB,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM;oBACtC,gBAAgB,EAAE,CAAC,GAAG,CAAC;iBAC1B;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM;oBACtC,gBAAgB,EAAE,SAAS;iBAC9B;aACJ;SACJ;KACJ,CAAC,CAAC;CACN"}
1
+ {"version":3,"file":"completions.commitChars.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/completions.commitChars.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,qBAAqB;AACrB,0BAA0B;AAC1B,uBAAuB;AACvB,kCAAkC;AAElC,sBAAsB;AACtB,8BAA8B;AAE9B,sBAAsB;AACtB,0BAA0B;AAC1B,oBAAoB;AAEpB,wBAAwB;AACxB,4BAA4B;AAC5B,uBAAuB;AACvB,sBAAsB;AACtB,iCAAiC;AAEjC,uBAAuB;AACvB,YAAY;AAEZ;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;oBACI,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM;oBACtC,gBAAgB,EAAE,CAAC,GAAG,CAAC;iBAC1B;gBACD;oBACI,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,gBAAgB,EAAE,CAAC,GAAG,CAAC;iBAC1B;gBACD;oBACI,KAAK,EAAE,UAAU;oBACjB,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,KAAK;oBACrC,gBAAgB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;iBAC/B;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,WAAW;oBAClB,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM;oBACtC,gBAAgB,EAAE,CAAC,GAAG,CAAC;iBAC1B;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM;oBACtC,gBAAgB,EAAE,EAAE;iBACvB;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,MAAM;oBACtC,gBAAgB,EAAE,EAAE;iBACvB;gBACD;oBACI,KAAK,EAAE,SAAS;oBAChB,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,QAAQ;oBACxC,gBAAgB,EAAE,EAAE;iBACvB;gBACD;oBACI,KAAK,EAAE,UAAU;oBACjB,IAAI,EAAE,MAAM,CAAC,kBAAkB,CAAC,KAAK;oBACrC,gBAAgB,EAAE,EAAE;iBACvB;aACJ;SACJ;KACJ,CAAC,CAAC;CACN"}
@@ -17,7 +17,7 @@
17
17
  definitions: [
18
18
  {
19
19
  path: helper.getMarkerByName('def1').fileName,
20
- range: { start: { line: 0, character: 16 }, end: { line: 0, character: 20 } },
20
+ range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
21
21
  },
22
22
  ],
23
23
  },
@@ -25,7 +25,7 @@
25
25
  definitions: [
26
26
  {
27
27
  path: helper.getMarkerByName('def2').fileName,
28
- range: { start: { line: 1, character: 16 }, end: { line: 1, character: 20 } },
28
+ range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } },
29
29
  },
30
30
  ],
31
31
  },
@@ -1 +1 @@
1
- {"version":3,"file":"findDefinitions.namespaceImport.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/findDefinitions.namespaceImport.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,gCAAgC;AAChC,MAAM;AACN,gCAAgC;AAChC,MAAM;AAEN,iCAAiC;AACjC,sBAAsB;AAEtB,yBAAyB;AACzB,sBAAsB;AAEtB,qBAAqB;AACrB,wCAAwC;AACxC,wCAAwC;AAExC;IACI,MAAM,CAAC,qBAAqB,CACxB;QACI,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ;oBAC7C,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE;iBAChF;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ;oBAC7C,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE;iBAChF;aACJ;SACJ;KACJ,EACD,cAAc,CACjB,CAAC;CACL"}
1
+ {"version":3,"file":"findDefinitions.namespaceImport.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/findDefinitions.namespaceImport.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,gCAAgC;AAChC,MAAM;AACN,gCAAgC;AAChC,MAAM;AAEN,iCAAiC;AACjC,sBAAsB;AAEtB,yBAAyB;AACzB,sBAAsB;AAEtB,qBAAqB;AACrB,wCAAwC;AACxC,wCAAwC;AAExC;IACI,MAAM,CAAC,qBAAqB,CACxB;QACI,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ;oBAC7C,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE;iBAC9E;aACJ;SACJ;QACD,OAAO,EAAE;YACL,WAAW,EAAE;gBACT;oBACI,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ;oBAC7C,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE;iBAC9E;aACJ;SACJ;KACJ,EACD,cAAc,CACjB,CAAC;CACL"}
@@ -0,0 +1 @@
1
+ /// <reference path="fourslash.d.ts" />
@@ -0,0 +1,45 @@
1
+ "use strict";
2
+ /// <reference path="fourslash.ts" />
3
+ // @filename: pyrightconfig.json
4
+ //// {
5
+ //// "functionSignatureDisplay": "formatted"
6
+ //// }
7
+ // @filename: test.py
8
+ //// from typing import overload
9
+ //// class A:
10
+ //// def __init__(self, x:int, y:int):
11
+ //// pass
12
+ ////
13
+ //// class B:
14
+ //// @overload
15
+ //// def __init__(self):
16
+ //// pass
17
+ //// @overload
18
+ //// def __init__(self, x:int, y:int):
19
+ //// pass
20
+ ////
21
+ //// a = [|/*a_constructor*/A|](1,2)
22
+ ////
23
+ //// b = [|/*b_constructorOverloads*/B|](1,2)
24
+ //// def [|/*paramFunc0*/foo|]():
25
+ //// pass
26
+ //// def [|/*paramFunc1*/foo1|](x:int):
27
+ //// pass
28
+ //// def [|/*paramFunc2*/foo2|](x:int, y:int):
29
+ //// pass
30
+ ////
31
+ //// @overload
32
+ //// def bar() -> int: ...
33
+ //// @overload
34
+ //// def bar(x:str, y:int) -> int: ...
35
+ ////
36
+ //// [|/*overload*/bar|]
37
+ helper.verifyHover('markdown', {
38
+ a_constructor: '```python\n(class) A(\n x: int,\n y: int\n)\n```',
39
+ b_constructorOverloads: '```python\n(class) B(\n x: int,\n y: int\n)\n```',
40
+ paramFunc0: '```python\n(function) foo() -> None\n```',
41
+ paramFunc1: '```python\n(function) foo1(x: int) -> None\n```',
42
+ paramFunc2: '```python\n(function) foo2(\n x: int,\n y: int\n) -> None\n```',
43
+ overload: '```python\n(function)\nbar() -> int\nbar(\n x: str,\n y: int\n) -> int\n```',
44
+ });
45
+ //# sourceMappingURL=hover.formatted.fourslash.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hover.formatted.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/hover.formatted.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,gCAAgC;AAChC,MAAM;AACN,8CAA8C;AAC9C,MAAM;AAEN,qBAAqB;AACrB,gCAAgC;AAChC,aAAa;AACb,0CAA0C;AAC1C,iBAAiB;AACjB,IAAI;AACJ,aAAa;AACb,kBAAkB;AAClB,4BAA4B;AAC5B,iBAAiB;AACjB,kBAAkB;AAClB,0CAA0C;AAC1C,iBAAiB;AACjB,IAAI;AACJ,oCAAoC;AACpC,IAAI;AACJ,6CAA6C;AAC7C,iCAAiC;AACjC,aAAa;AACb,uCAAuC;AACvC,aAAa;AACb,8CAA8C;AAC9C,aAAa;AACb,IAAI;AACJ,cAAc;AACd,0BAA0B;AAC1B,cAAc;AACd,sCAAsC;AACtC,IAAI;AACJ,wBAAwB;AAExB,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE;IAC3B,aAAa,EAAE,wDAAwD;IACvE,sBAAsB,EAAE,wDAAwD;IAChF,UAAU,EAAE,0CAA0C;IACtD,UAAU,EAAE,iDAAiD;IAC7D,UAAU,EAAE,sEAAsE;IAClF,QAAQ,EAAE,mFAAmF;CAChG,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ /// <reference path="fourslash.d.ts" />
@@ -0,0 +1,23 @@
1
+ "use strict";
2
+ /// <reference path="fourslash.ts" />
3
+ // @filename: test.py
4
+ //// from typing import overload
5
+ ////
6
+ //// @overload
7
+ //// def func(a: int) -> int:
8
+ //// ...
9
+ ////
10
+ //// @overload
11
+ //// def func(a: str) -> str:
12
+ //// ...
13
+ ////
14
+ //// def func(a: int | str) -> int | str:
15
+ //// return a
16
+ ////
17
+ //// [|/*marker1*/func|](1)
18
+ //// [|/*marker2*/func|]("hi")
19
+ helper.verifyHover('markdown', {
20
+ marker1: '```python\n(function) func(a: int) -> int\n```',
21
+ marker2: '```python\n(function) func(a: str) -> str\n```',
22
+ });
23
+ //# sourceMappingURL=hover.overloadedFunction.fourslash.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hover.overloadedFunction.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/hover.overloadedFunction.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,qBAAqB;AACrB,gCAAgC;AAChC,IAAI;AACJ,cAAc;AACd,6BAA6B;AAC7B,YAAY;AACZ,IAAI;AACJ,cAAc;AACd,6BAA6B;AAC7B,YAAY;AACZ,IAAI;AACJ,yCAAyC;AACzC,iBAAiB;AACjB,IAAI;AACJ,2BAA2B;AAC3B,8BAA8B;AAE9B,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE;IAC3B,OAAO,EAAE,gDAAgD;IACzD,OAAO,EAAE,gDAAgD;CAC5D,CAAC,CAAC"}
@@ -101,6 +101,7 @@ class TestLanguageService {
101
101
  useLibraryCodeForTypes: this._workspace.serviceInstance.getConfigOptions().useLibraryCodeForTypes,
102
102
  disableLanguageServices: this._workspace.disableLanguageServices,
103
103
  autoImportCompletions: this._workspace.serviceInstance.getConfigOptions().autoImportCompletions,
104
+ functionSignatureDisplay: this._workspace.serviceInstance.getConfigOptions().functionSignatureDisplay,
104
105
  };
105
106
  return Promise.resolve(settings);
106
107
  }
@@ -1 +1 @@
1
- {"version":3,"file":"testLanguageService.js","sourceRoot":"","sources":["../../../../../src/tests/harness/fourslash/testLanguageService.ts"],"names":[],"mappings":"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"}
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;AAI/C,yDAAsD;AACtD,oEAQqC;AACrC,oFAAiF;AACjF,sDAAmD;AAGnD,MAAa,YAAY;IAAzB;QACI,0BAAqB,GAA0B,yBAAe,CAAC,oBAAoB,CAAC;QACpF,qCAAgC,GAAqC,CACjE,SAAiB,EACjB,OAAyB,EACzB,aAA4B,EAC5B,cAA8B,EAC9B,SAAoC,EACpC,kBAA2C,EAC3C,eAAiC,EACjC,YAA2B,EAC7B,EAAE,CACA,IAAI,qDAAyB,CACzB,OAAO,EACP,aAAa,EACb,cAAc,EACd,SAAS,EACT,kBAAkB,EAClB,eAAe;QACf,oBAAoB,CAAC,SAAS,EAC9B,YAAY,CACf,CAAC;IAkBV,CAAC;IAhBG,UAAU,CAAC,SAAmC,EAAE,QAAiB,EAAE,OAAgB;QAC/E,WAAW;IACf,CAAC;IAED,yBAAyB,CACrB,SAAmC,EACnC,QAAgB,EAChB,KAAY,EACZ,KAAwB;QAExB,OAAO,uCAAkB,CAAC,yBAAyB,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACtG,CAAC;IACD,OAAO,CAAC,EAA2B,EAAE,MAA4B,EAAE,KAAwB;QACvF,MAAM,UAAU,GAAG,IAAI,qCAAiB,CAAC,EAAE,CAAC,CAAC;QAC7C,OAAO,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;CACJ;AAvCD,oCAuCC;AAED,MAAa,mBAAmB;IAK5B,YAAY,SAAmC,EAAW,OAAyB,EAAW,EAAc;QAAlD,YAAO,GAAP,OAAO,CAAkB;QAAW,OAAE,GAAF,EAAE,CAAY;QA+DnG,aAAQ,GAAG,IAAI,CAAC,GAAG,CAAC;QACpB,WAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC1B,yBAAoB,GAAG,IAAI,CAAC;QAhEjC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG;YACrB,aAAa,EAAE,EAAE;YACjB,QAAQ,EAAE,EAAE;YACZ,IAAI,EAAE,EAAE;YACR,GAAG,EAAE,EAAE;YACP,KAAK,EAAE,CAAC,4CAAuB,CAAC,IAAI,CAAC;YACrC,eAAe,EAAE,IAAI,yBAAe,CAAC,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;gBAC1D,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,+BAAc,EAAE;gBACvC,qBAAqB,EAAE,yBAAe,CAAC,oBAAoB;gBAC3D,aAAa,EAAE,IAAI,6BAAa,CAAC,GAAG,CAAC;aACxC,CAAC;YACF,uBAAuB,EAAE,KAAK;YAC9B,sBAAsB,EAAE,KAAK;YAC7B,sBAAsB,EAAE,KAAK;YAC7B,aAAa,EAAE,IAAA,qCAAgB,GAAE;YACjC,kBAAkB,EAAE,EAAE;SACzB,CAAC;IACN,CAAC;IACD,qBAAqB,CAAC,SAAiB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;IAC5D,CAAC;IAED,mBAAmB,CAAC,QAAgB;QAChC,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC/C,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC3C;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACnD,CAAC;IAED,WAAW,CAAC,SAAmC;QAC3C,MAAM,QAAQ,GAAmB;YAC7B,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,QAAQ;YACrE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,UAAU;YACzE,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,YAAY;YAC7E,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,kBAAkB;YACpF,sBAAsB,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,sBAAsB;YACjG,uBAAuB,EAAE,IAAI,CAAC,UAAU,CAAC,uBAAuB;YAChE,qBAAqB,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,qBAAqB;YAC/F,wBAAwB,EAAE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC,wBAAwB;SACxG,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,wBAAwB,CAAC,SAAiB;QACtC,qCAAqC;QACrC,mDAAmD;QACnD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,SAAS;QACL,oBAAoB;IACxB,CAAC;IAED,OAAO;QACH,oBAAoB;IACxB,CAAC;CAKJ;AAvED,kDAuEC;AAED,MAAM,UAAU;IAGZ,gBAAgB,CAAC,OAAe,EAAE,GAAG,OAAwB;QACzD,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACtC,CAAC;IAID,kBAAkB,CAAC,OAAe,EAAE,GAAG,OAAwB;QAC3D,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACtC,CAAC;IAID,sBAAsB,CAAC,OAAe,EAAE,GAAG,OAAwB;QAC/D,oBAAoB;IACxB,CAAC;CACJ"}
@@ -228,13 +228,3 @@ export declare function parseAndGetTestState(code: string, projectRoot?: string,
228
228
  };
229
229
  export declare function getNodeForRange(codeOrState: string | TestState, markerName?: string): ParseNode;
230
230
  export declare function getNodeAtMarker(codeOrState: string | TestState, markerName?: string): ParseNode;
231
- export declare function createVfsInfoFromFourSlashData(projectRoot: string, testData: FourSlashData): {
232
- files: vfs.FileSet;
233
- sourceFileNames: string[];
234
- projectRoot: string;
235
- ignoreCase: boolean;
236
- rawConfigJson: string;
237
- };
238
- export declare function getMarkerName(testData: FourSlashData, markerToFind: Marker): string;
239
- export declare function getMarkerByName(testData: FourSlashData, markerName: string): Marker;
240
- export declare function getMarkerNames(testData: FourSlashData): string[];
@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
22
22
  return (mod && mod.__esModule) ? mod : { "default": mod };
23
23
  };
24
24
  Object.defineProperty(exports, "__esModule", { value: true });
25
- exports.getMarkerNames = exports.getMarkerByName = exports.getMarkerName = exports.createVfsInfoFromFourSlashData = exports.getNodeAtMarker = exports.getNodeForRange = exports.parseAndGetTestState = exports.TestState = void 0;
25
+ exports.getNodeAtMarker = exports.getNodeForRange = exports.parseAndGetTestState = exports.TestState = void 0;
26
26
  /*
27
27
  * testState.ts
28
28
  * Copyright (c) Microsoft Corporation.
@@ -32,7 +32,6 @@ exports.getMarkerNames = exports.getMarkerByName = exports.getMarkerName = expor
32
32
  * the test states.
33
33
  */
34
34
  const assert_1 = __importDefault(require("assert"));
35
- const JSONC = __importStar(require("jsonc-parser"));
36
35
  const path = __importStar(require("path"));
37
36
  const vscode_languageserver_1 = require("vscode-languageserver");
38
37
  const parseTreeUtils_1 = require("../../../analyzer/parseTreeUtils");
@@ -45,7 +44,6 @@ const core_1 = require("../../../common/core");
45
44
  const debug = __importStar(require("../../../common/debug"));
46
45
  const pathUtils_1 = require("../../../common/pathUtils");
47
46
  const positionUtils_1 = require("../../../common/positionUtils");
48
- const stringUtils_1 = require("../../../common/stringUtils");
49
47
  const textRange_1 = require("../../../common/textRange");
50
48
  const languageServerBase_1 = require("../../../languageServerBase");
51
49
  const definitionProvider_1 = require("../../../languageService/definitionProvider");
@@ -60,6 +58,7 @@ const vfs = __importStar(require("../vfs/filesystem"));
60
58
  const fourSlashParser_1 = require("./fourSlashParser");
61
59
  const fourSlashTypes_1 = require("./fourSlashTypes");
62
60
  const testLanguageService_1 = require("./testLanguageService");
61
+ const testStateUtils_1 = require("./testStateUtils");
63
62
  const workspaceEditTestUtils_1 = require("./workspaceEditTestUtils");
64
63
  const testAccessHost = new testAccessHost_1.TestAccessHost(vfs.MODULE_PATH, [factory_1.libFolder, factory_1.distlibFolder]);
65
64
  class TestState {
@@ -72,7 +71,7 @@ class TestState {
72
71
  // The position of the end of the current selection, or -1 if nothing is selected
73
72
  this.selectionEnd = -1;
74
73
  this.lastKnownMarker = '';
75
- const vfsInfo = createVfsInfoFromFourSlashData(projectRoot, testData);
74
+ const vfsInfo = (0, testStateUtils_1.createVfsInfoFromFourSlashData)(projectRoot, testData);
76
75
  this.testFS =
77
76
  testFS !== null && testFS !== void 0 ? testFS : (0, factory_1.createFromFileSystem)(host.HOST, vfsInfo.ignoreCase, { cwd: vfsInfo.projectRoot, files: vfsInfo.files, meta: testData.globalOptions }, mountPaths);
78
77
  this.console = new console_1.NullConsole();
@@ -159,17 +158,17 @@ class TestState {
159
158
  return this.fs.getMappedFilePath(path);
160
159
  }
161
160
  getMarkerName(m) {
162
- return getMarkerName(this.testData, m);
161
+ return (0, testStateUtils_1.getMarkerName)(this.testData, m);
163
162
  }
164
163
  getMarkerByName(markerName) {
165
- return getMarkerByName(this.testData, markerName);
164
+ return (0, testStateUtils_1.getMarkerByName)(this.testData, markerName);
166
165
  }
167
166
  getMarkers() {
168
167
  // Return a copy of the list
169
168
  return this.testData.markers.slice(0);
170
169
  }
171
170
  getMarkerNames() {
172
- return getMarkerNames(this.testData);
171
+ return (0, testStateUtils_1.getMarkerNames)(this.testData);
173
172
  }
174
173
  getPositionRange(markerString) {
175
174
  const marker = this.getMarkerByName(markerString);
@@ -872,7 +871,10 @@ class TestState {
872
871
  _convertGlobalOptionsToConfigOptions(projectRoot, mountPaths) {
873
872
  const configOptions = new configOptions_1.ConfigOptions(projectRoot);
874
873
  // add more global options as we need them
875
- return this._applyTestConfigOptions(configOptions, mountPaths);
874
+ const newConfigOptions = this._applyTestConfigOptions(configOptions, mountPaths);
875
+ // default tests to run use compact signatures.
876
+ newConfigOptions.functionSignatureDisplay = configOptions_1.SignatureDisplayType.compact;
877
+ return newConfigOptions;
876
878
  }
877
879
  _applyTestConfigOptions(configOptions, mountPaths) {
878
880
  // Always enable "test mode".
@@ -892,6 +894,9 @@ class TestState {
892
894
  configOptions.exclude.push((0, pathUtils_1.getFileSpec)(this.fs, configOptions.projectRoot, mountPath));
893
895
  }
894
896
  }
897
+ if (configOptions.functionSignatureDisplay === undefined) {
898
+ configOptions.functionSignatureDisplay === configOptions_1.SignatureDisplayType.compact;
899
+ }
895
900
  return configOptions;
896
901
  }
897
902
  getFileContent(fileName) {
@@ -1224,7 +1229,7 @@ class TestState {
1224
1229
  }
1225
1230
  }
1226
1231
  verifyCompletionItem(expected, actual) {
1227
- var _a, _b;
1232
+ var _a, _b, _c;
1228
1233
  assert_1.default.strictEqual(actual.label, expected.label);
1229
1234
  assert_1.default.strictEqual(actual.detail, expected.detail);
1230
1235
  assert_1.default.strictEqual(actual.kind, expected.kind);
@@ -1235,7 +1240,7 @@ class TestState {
1235
1240
  assert_1.default.strictEqual((_a = actual.labelDetails) === null || _a === void 0 ? void 0 : _a.description, expected.detailDescription);
1236
1241
  }
1237
1242
  if (expected.commitCharacters !== undefined) {
1238
- expect(expected.commitCharacters.sort()).toEqual((_b = actual.commitCharacters) === null || _b === void 0 ? void 0 : _b.sort());
1243
+ expect(expected.commitCharacters.sort()).toEqual((_c = (_b = actual.commitCharacters) === null || _b === void 0 ? void 0 : _b.sort()) !== null && _c !== void 0 ? _c : []);
1239
1244
  }
1240
1245
  }
1241
1246
  }
@@ -1276,62 +1281,4 @@ function getNodeAtMarker(codeOrState, markerName = 'marker') {
1276
1281
  return node;
1277
1282
  }
1278
1283
  exports.getNodeAtMarker = getNodeAtMarker;
1279
- function createVfsInfoFromFourSlashData(projectRoot, testData) {
1280
- const metaProjectRoot = testData.globalOptions["projectroot" /* projectRoot */];
1281
- projectRoot = metaProjectRoot ? (0, pathUtils_1.combinePaths)(projectRoot, metaProjectRoot) : projectRoot;
1282
- const ignoreCase = (0, core_1.toBoolean)(testData.globalOptions["ignorecase" /* ignoreCase */]);
1283
- let rawConfigJson = '';
1284
- const sourceFileNames = [];
1285
- const files = {};
1286
- for (const file of testData.files) {
1287
- // if one of file is configuration file, set config options from the given json
1288
- if (isConfig(file, ignoreCase)) {
1289
- try {
1290
- rawConfigJson = JSONC.parse(file.content);
1291
- }
1292
- catch (e) {
1293
- throw new Error(`Failed to parse test ${file.fileName}: ${e.message}`);
1294
- }
1295
- }
1296
- else {
1297
- files[file.fileName] = new vfs.File(file.content, { meta: file.fileOptions, encoding: 'utf8' });
1298
- if (!(0, core_1.toBoolean)(file.fileOptions["library" /* library */])) {
1299
- sourceFileNames.push(file.fileName);
1300
- }
1301
- }
1302
- }
1303
- return { files, sourceFileNames, projectRoot, ignoreCase, rawConfigJson };
1304
- }
1305
- exports.createVfsInfoFromFourSlashData = createVfsInfoFromFourSlashData;
1306
- function getMarkerName(testData, markerToFind) {
1307
- let found;
1308
- testData.markerPositions.forEach((marker, name) => {
1309
- if (marker === markerToFind) {
1310
- found = name;
1311
- }
1312
- });
1313
- assert_1.default.ok(found);
1314
- return found;
1315
- }
1316
- exports.getMarkerName = getMarkerName;
1317
- function getMarkerByName(testData, markerName) {
1318
- const markerPos = testData.markerPositions.get(markerName);
1319
- if (markerPos === undefined) {
1320
- throw new Error(`Unknown marker "${markerName}" Available markers: ${getMarkerNames(testData)
1321
- .map((m) => '"' + m + '"')
1322
- .join(', ')}`);
1323
- }
1324
- else {
1325
- return markerPos;
1326
- }
1327
- }
1328
- exports.getMarkerByName = getMarkerByName;
1329
- function getMarkerNames(testData) {
1330
- return [...testData.markerPositions.keys()];
1331
- }
1332
- exports.getMarkerNames = getMarkerNames;
1333
- function isConfig(file, ignoreCase) {
1334
- const comparer = (0, stringUtils_1.getStringComparer)(ignoreCase);
1335
- return service_1.configFileNames.some((f) => comparer((0, pathUtils_1.getBaseFileName)(file.fileName), f) === 0 /* EqualTo */);
1336
- }
1337
1284
  //# sourceMappingURL=testState.js.map