@zzzen/pyright-internal 1.2.0-dev.20240307 → 1.2.0-dev.20240317

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 (106) hide show
  1. package/dist/analyzer/backgroundAnalysisProgram.d.ts +1 -1
  2. package/dist/analyzer/backgroundAnalysisProgram.js +1 -1
  3. package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
  4. package/dist/analyzer/checker.d.ts +1 -0
  5. package/dist/analyzer/checker.js +58 -55
  6. package/dist/analyzer/checker.js.map +1 -1
  7. package/dist/analyzer/codeFlowEngine.d.ts +3 -4
  8. package/dist/analyzer/codeFlowEngine.js +20 -13
  9. package/dist/analyzer/codeFlowEngine.js.map +1 -1
  10. package/dist/analyzer/importStatementUtils.d.ts +2 -1
  11. package/dist/analyzer/importStatementUtils.js +6 -1
  12. package/dist/analyzer/importStatementUtils.js.map +1 -1
  13. package/dist/analyzer/operations.js +25 -10
  14. package/dist/analyzer/operations.js.map +1 -1
  15. package/dist/analyzer/parseTreeUtils.d.ts +2 -0
  16. package/dist/analyzer/parseTreeUtils.js +31 -5
  17. package/dist/analyzer/parseTreeUtils.js.map +1 -1
  18. package/dist/analyzer/patternMatching.js +16 -12
  19. package/dist/analyzer/patternMatching.js.map +1 -1
  20. package/dist/analyzer/service.d.ts +6 -1
  21. package/dist/analyzer/service.js +8 -5
  22. package/dist/analyzer/service.js.map +1 -1
  23. package/dist/analyzer/typeDocStringUtils.js +3 -3
  24. package/dist/analyzer/typeDocStringUtils.js.map +1 -1
  25. package/dist/analyzer/typeEvaluator.js +242 -101
  26. package/dist/analyzer/typeEvaluator.js.map +1 -1
  27. package/dist/analyzer/typeEvaluatorTypes.d.ts +6 -1
  28. package/dist/analyzer/typeGuards.js +15 -16
  29. package/dist/analyzer/typeGuards.js.map +1 -1
  30. package/dist/analyzer/typeUtils.d.ts +1 -1
  31. package/dist/analyzer/typeUtils.js +13 -14
  32. package/dist/analyzer/typeUtils.js.map +1 -1
  33. package/dist/analyzer/types.d.ts +2 -1
  34. package/dist/analyzer/types.js +1 -0
  35. package/dist/analyzer/types.js.map +1 -1
  36. package/dist/backgroundThreadBase.d.ts +4 -1
  37. package/dist/backgroundThreadBase.js +14 -1
  38. package/dist/backgroundThreadBase.js.map +1 -1
  39. package/dist/commands/dumpFileDebugInfoCommand.js +0 -1
  40. package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
  41. package/dist/common/configOptions.d.ts +1 -0
  42. package/dist/common/configOptions.js +5 -0
  43. package/dist/common/configOptions.js.map +1 -1
  44. package/dist/common/diagnosticRules.d.ts +1 -0
  45. package/dist/common/diagnosticRules.js +1 -0
  46. package/dist/common/diagnosticRules.js.map +1 -1
  47. package/dist/common/logTracker.d.ts +5 -5
  48. package/dist/common/logTracker.js +7 -6
  49. package/dist/common/logTracker.js.map +1 -1
  50. package/dist/languageServerBase.d.ts +2 -2
  51. package/dist/languageServerBase.js +1 -8
  52. package/dist/languageServerBase.js.map +1 -1
  53. package/dist/languageService/completionProvider.d.ts +4 -1
  54. package/dist/languageService/completionProvider.js +19 -19
  55. package/dist/languageService/completionProvider.js.map +1 -1
  56. package/dist/localization/localize.d.ts +4 -0
  57. package/dist/localization/localize.js +1 -8
  58. package/dist/localization/localize.js.map +1 -1
  59. package/dist/localization/package.nls.cs.json +19 -9
  60. package/dist/localization/package.nls.de.json +19 -9
  61. package/dist/localization/package.nls.en-us.json +1 -0
  62. package/dist/localization/package.nls.es.json +19 -9
  63. package/dist/localization/package.nls.fr.json +21 -11
  64. package/dist/localization/package.nls.it.json +16 -6
  65. package/dist/localization/package.nls.ja.json +19 -9
  66. package/dist/localization/package.nls.ko.json +19 -9
  67. package/dist/localization/package.nls.pl.json +19 -9
  68. package/dist/localization/package.nls.pt-br.json +19 -9
  69. package/dist/localization/package.nls.qps-ploc.json +19 -9
  70. package/dist/localization/package.nls.ru.json +18 -8
  71. package/dist/localization/package.nls.tr.json +19 -9
  72. package/dist/localization/package.nls.zh-cn.json +16 -6
  73. package/dist/localization/package.nls.zh-tw.json +19 -9
  74. package/dist/parser/parser.js +1 -1
  75. package/dist/parser/parser.js.map +1 -1
  76. package/dist/parser/stringTokenUtils.js +12 -12
  77. package/dist/parser/stringTokenUtils.js.map +1 -1
  78. package/dist/parser/tokenizer.d.ts +0 -1
  79. package/dist/parser/tokenizer.js +41 -41
  80. package/dist/parser/tokenizer.js.map +1 -1
  81. package/dist/parser/tokenizerTypes.d.ts +1 -2
  82. package/dist/parser/tokenizerTypes.js +0 -1
  83. package/dist/parser/tokenizerTypes.js.map +1 -1
  84. package/dist/tests/fourslash/completions.override2.fourslash.js +1 -1
  85. package/dist/tests/fourslash/completions.override2.fourslash.js.map +1 -1
  86. package/dist/tests/fourslash/hover.builtinDocstrings.builtinInheritedByBuiltin.fourslash.d.ts +1 -0
  87. package/dist/tests/fourslash/hover.builtinDocstrings.builtinInheritedByBuiltin.fourslash.js +22 -0
  88. package/dist/tests/fourslash/hover.builtinDocstrings.builtinInheritedByBuiltin.fourslash.js.map +1 -0
  89. package/dist/tests/fourslash/hover.builtinDocstrings.builtinInheritedByUserCode.fourslash.d.ts +1 -0
  90. package/dist/tests/fourslash/hover.builtinDocstrings.builtinInheritedByUserCode.fourslash.js +20 -0
  91. package/dist/tests/fourslash/hover.builtinDocstrings.builtinInheritedByUserCode.fourslash.js.map +1 -0
  92. package/dist/tests/harness/fourslash/testLanguageService.d.ts +2 -1
  93. package/dist/tests/harness/fourslash/testLanguageService.js +2 -2
  94. package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
  95. package/dist/tests/importStatementUtils.test.js +27 -2
  96. package/dist/tests/importStatementUtils.test.js.map +1 -1
  97. package/dist/tests/tokenizer.test.js +22 -0
  98. package/dist/tests/tokenizer.test.js.map +1 -1
  99. package/dist/tests/typeEvaluator1.test.js +4 -0
  100. package/dist/tests/typeEvaluator1.test.js.map +1 -1
  101. package/dist/tests/typeEvaluator2.test.js +1 -1
  102. package/dist/tests/typeEvaluator3.test.js +1 -1
  103. package/dist/tests/typeEvaluator4.test.js +2 -2
  104. package/dist/tests/typeEvaluator5.test.js +9 -7
  105. package/dist/tests/typeEvaluator5.test.js.map +1 -1
  106. package/package.json +1 -1
@@ -0,0 +1 @@
1
+ /// <reference path="fourslash.d.ts" />
@@ -0,0 +1,22 @@
1
+ "use strict";
2
+ /// <reference path="fourslash.ts" />
3
+ // @filename: typeshed-fallback/stdlib/builtins.pyi
4
+ //// class baseClass:
5
+ //// def method(self) -> None: ...
6
+ ////
7
+ //// class derivedClass(baseClass): ...
8
+ // @filename: typeshed-fallback/stdlib/builtins.py
9
+ //// class baseClass:
10
+ //// def method(self) -> None:
11
+ //// """baseClass doc string"""
12
+ //// pass
13
+ ////
14
+ //// class derivedClass(baseClass):
15
+ //// pass
16
+ // @filename: test.py
17
+ //// x = derivedClass()
18
+ //// x.[|/*marker*/method|]()
19
+ helper.verifyHover('markdown', {
20
+ marker: '```python\n(method) def method() -> None\n```\n---\nbaseClass doc string',
21
+ });
22
+ //# sourceMappingURL=hover.builtinDocstrings.builtinInheritedByBuiltin.fourslash.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hover.builtinDocstrings.builtinInheritedByBuiltin.fourslash.js","sourceRoot":"","sources":["../../../../../../src/tests/fourslash/hover.builtinDocstrings.builtinInheritedByBuiltin.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,mDAAmD;AACnD,qBAAqB;AACrB,sCAAsC;AACtC,IAAI;AACJ,uCAAuC;AAEvC,kDAAkD;AAClD,qBAAqB;AACrB,kCAAkC;AAClC,uCAAuC;AACvC,iBAAiB;AACjB,IAAI;AACJ,mCAAmC;AACnC,aAAa;AAEb,qBAAqB;AACrB,uBAAuB;AACvB,6BAA6B;AAE7B,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE;IAC3B,MAAM,EAAE,0EAA0E;CACrF,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ /// <reference path="fourslash.d.ts" />
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ /// <reference path="fourslash.ts" />
3
+ // @filename: typeshed-fallback/stdlib/builtins.pyi
4
+ //// class baseClass:
5
+ //// def method(self) -> None: ...
6
+ // @filename: typeshed-fallback/stdlib/builtins.py
7
+ //// class baseClass:
8
+ //// def method(self) -> None:
9
+ //// """baseClass doc string"""
10
+ //// pass
11
+ // @filename: test.py
12
+ //// class derivedClass(baseClass):
13
+ //// pass
14
+ ////
15
+ //// x = derivedClass()
16
+ //// x.[|/*marker*/method|]()
17
+ helper.verifyHover('markdown', {
18
+ marker: '```python\n(method) def method() -> None\n```',
19
+ });
20
+ //# sourceMappingURL=hover.builtinDocstrings.builtinInheritedByUserCode.fourslash.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hover.builtinDocstrings.builtinInheritedByUserCode.fourslash.js","sourceRoot":"","sources":["../../../../../../src/tests/fourslash/hover.builtinDocstrings.builtinInheritedByUserCode.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,mDAAmD;AACnD,qBAAqB;AACrB,sCAAsC;AAEtC,kDAAkD;AAClD,qBAAqB;AACrB,kCAAkC;AAClC,uCAAuC;AACvC,iBAAiB;AAEjB,qBAAqB;AACrB,mCAAmC;AACnC,aAAa;AACb,IAAI;AACJ,uBAAuB;AACvB,6BAA6B;AAE7B,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE;IAC3B,MAAM,EAAE,+CAA+C;CAC1D,CAAC,CAAC"}
@@ -1,6 +1,7 @@
1
1
  import { CancellationToken, CodeAction, ExecuteCommandParams } from 'vscode-languageserver';
2
2
  import { BackgroundAnalysisProgramFactory } from '../../../analyzer/backgroundAnalysisProgram';
3
3
  import { ImportResolverFactory } from '../../../analyzer/importResolver';
4
+ import { AnalyzerServiceOptions } from '../../../analyzer/service';
4
5
  import { BackgroundAnalysisBase } from '../../../backgroundAnalysisBase';
5
6
  import { ConsoleInterface } from '../../../common/console';
6
7
  import { FileSystem } from '../../../common/fileSystem';
@@ -24,7 +25,7 @@ export declare class TestLanguageService implements LanguageServerInterface {
24
25
  readonly supportAdvancedEdits = true;
25
26
  private readonly _workspace;
26
27
  private readonly _defaultWorkspace;
27
- constructor(workspace: Workspace, console: ConsoleInterface, fs: FileSystem);
28
+ constructor(workspace: Workspace, console: ConsoleInterface, fs: FileSystem, options?: AnalyzerServiceOptions);
28
29
  getWorkspaces(): Promise<Workspace[]>;
29
30
  getWorkspaceForFile(uri: Uri): Promise<Workspace>;
30
31
  getSettings(_workspace: Workspace): Promise<ServerSettings>;
@@ -60,7 +60,7 @@ class TestFeatures {
60
60
  }
61
61
  exports.TestFeatures = TestFeatures;
62
62
  class TestLanguageService {
63
- constructor(workspace, console, fs) {
63
+ constructor(workspace, console, fs, options) {
64
64
  this.console = console;
65
65
  this.fs = fs;
66
66
  this.rootUri = uri_1.Uri.file('/');
@@ -73,7 +73,7 @@ class TestLanguageService {
73
73
  pythonPath: undefined,
74
74
  pythonPathKind: workspaceFactory_1.WorkspacePythonPathKind.Mutable,
75
75
  kinds: [workspaceFactory_1.WellKnownWorkspaceKinds.Test],
76
- service: new service_1.AnalyzerService('test service', new serviceProvider_1.ServiceProvider(), {
76
+ service: new service_1.AnalyzerService('test service', new serviceProvider_1.ServiceProvider(), options !== null && options !== void 0 ? options : {
77
77
  console: this.console,
78
78
  hostFactory: () => new testAccessHost_1.TestAccessHost(),
79
79
  importResolverFactory: service_1.AnalyzerService.createImportResolver,
@@ -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":"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"}
@@ -321,10 +321,35 @@ test('getRelativeModuleName over fake file', () => {
321
321
  `;
322
322
  const state = (0, testState_1.parseAndGetTestState)(code).state;
323
323
  const dest = uri_1.Uri.file(state.getMarkerByName('dest').fileName);
324
- assert_1.default.strictEqual((0, importStatementUtils_1.getRelativeModuleName)(state.fs, dest.getDirectory().combinePaths('source.py'), dest,
324
+ assert_1.default.strictEqual((0, importStatementUtils_1.getRelativeModuleName)(state.fs, dest.getDirectory().combinePaths('source.py'), dest, state.configOptions,
325
325
  /*ignoreFolderStructure*/ false,
326
326
  /*sourceIsFile*/ true), '.target');
327
327
  });
328
+ test('getRelativeModuleName - target in stub path', () => {
329
+ const code = `
330
+ // @filename: source.py
331
+ //// [|/*src*/|]
332
+
333
+ // @filename: typings/library/__init__.py
334
+ //// [|/*dest*/|]
335
+ `;
336
+ testRelativeModuleName(code, undefined);
337
+ });
338
+ test('getRelativeModuleName - target in typeshed path', () => {
339
+ const code = `
340
+ // @filename: pyrightconfig.json
341
+ //// {
342
+ //// "typeshedPath": "my_typeshed"
343
+ //// }
344
+
345
+ // @filename: source.py
346
+ //// [|/*src*/|]
347
+
348
+ // @filename: my_typeshed/library/__init__.py
349
+ //// [|/*dest*/|]
350
+ `;
351
+ testRelativeModuleName(code, undefined);
352
+ });
328
353
  test('resolve alias of not needed file', () => {
329
354
  const code = `
330
355
  // @filename: pyrightconfig.json
@@ -362,7 +387,7 @@ function testRelativeModuleName(code, expected, ignoreFolderStructure = false) {
362
387
  const state = (0, testState_1.parseAndGetTestState)(code).state;
363
388
  const src = uri_1.Uri.file(state.getMarkerByName('src').fileName);
364
389
  const dest = uri_1.Uri.file(state.getMarkerByName('dest').fileName);
365
- assert_1.default.strictEqual((0, importStatementUtils_1.getRelativeModuleName)(state.fs, src, dest, ignoreFolderStructure), expected);
390
+ assert_1.default.strictEqual((0, importStatementUtils_1.getRelativeModuleName)(state.fs, src, dest, state.configOptions, ignoreFolderStructure), expected);
366
391
  }
367
392
  function testAddition(code, markerName, importNameInfo, moduleName) {
368
393
  const state = (0, testState_1.parseAndGetTestState)(code).state;
@@ -1 +1 @@
1
- {"version":3,"file":"importStatementUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/importStatementUtils.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"importStatementUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/importStatementUtils.test.ts"],"names":[],"mappings":"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"}
@@ -1430,6 +1430,28 @@ test('Comments1', () => {
1430
1430
  assert_1.default.equal(results.tokens.contains(49), true);
1431
1431
  assert_1.default.equal(results.tokens.contains(50), false);
1432
1432
  });
1433
+ test('Comments2', () => {
1434
+ const t = new tokenizer_1.Tokenizer();
1435
+ const results = t.tokenize('class A:\n def func(self):\n pass\n # comment\n ');
1436
+ assert_1.default.equal(results.tokens.count, 16 + _implicitTokenCount);
1437
+ const token17 = results.tokens.getItemAt(17);
1438
+ assert_1.default.equal(token17.type, 1 /* TokenType.EndOfStream */);
1439
+ assert_1.default.equal(token17.comments, undefined);
1440
+ const start = token17.start;
1441
+ const token16 = results.tokens.getItemAt(16);
1442
+ assert_1.default.equal(token16.type, 4 /* TokenType.Dedent */);
1443
+ assert_1.default.equal(token16.start, start);
1444
+ assert_1.default.equal(token16.comments, undefined);
1445
+ // When multiple tokens have the same start position (and 0-length)
1446
+ // comments, if any, are stored on the first such token.
1447
+ const token15 = results.tokens.getItemAt(15);
1448
+ assert_1.default.equal(token15.type, 4 /* TokenType.Dedent */);
1449
+ assert_1.default.equal(token15.start, start);
1450
+ assert_1.default.equal(token15.comments.length, 1);
1451
+ assert_1.default.equal(token15.comments[0].value, ' comment');
1452
+ const token14 = results.tokens.getItemAt(14);
1453
+ assert_1.default.notEqual(token14.start, start);
1454
+ });
1433
1455
  test('Identifiers1', () => {
1434
1456
  const t = new tokenizer_1.Tokenizer();
1435
1457
  const results = t.tokenize('배열 数値 лік Opciók 可選值');