Skip to content

Commit 36a58cd

Browse files
bschnurrbschnurr
authoredJan 8, 2025
pull-pylance-with-pyright-1.1.391-20250108-044808 (#9673)
·
1.1.3981.1.392
1 parent cba1872 commit 36a58cd

26 files changed

+7996
-9730
lines changed
 

‎package-lock.json

+5,681-8,321
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"devDependencies": {
2424
"@types/glob": "^7.2.0",
25-
"@types/node": "^22.7.0",
25+
"@types/node": "^22.10.5",
2626
"@types/yargs": "^16.0.9",
2727
"@typescript-eslint/eslint-plugin": "^6.21.0",
2828
"@typescript-eslint/parser": "^6.21.0",
@@ -32,7 +32,7 @@
3232
"eslint-plugin-simple-import-sort": "^10.0.0",
3333
"glob": "^7.2.3",
3434
"jsonc-parser": "^3.3.1",
35-
"lerna": "^8.1.8",
35+
"lerna": "^8.1.9",
3636
"npm-check-updates": "^16.14.20",
3737
"p-queue": "^6.6.2",
3838
"prettier": "2.8.8",

‎packages/pyright-internal/package-lock.json

+849-521
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/pyright-internal/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
"devDependencies": {
4040
"@types/command-line-args": "^5.2.3",
4141
"@types/fs-extra": "^11.0.4",
42-
"@types/jest": "^29.5.13",
43-
"@types/lodash": "^4.17.7",
44-
"@types/node": "^22.7.0",
42+
"@types/jest": "^29.5.14",
43+
"@types/lodash": "^4.17.14",
44+
"@types/node": "^22.10.5",
4545
"@types/tmp": "^0.2.6",
4646
"copy-webpack-plugin": "^11.0.0",
4747
"esbuild-loader": "^3.2.0",
@@ -51,7 +51,7 @@
5151
"ts-jest": "^29.2.5",
5252
"ts-loader": "^9.5.1",
5353
"typescript": "~5.5.4",
54-
"webpack": "^5.94.0",
54+
"webpack": "^5.97.1",
5555
"webpack-cli": "^5.1.4",
5656
"word-wrap": "1.2.5"
5757
}

‎packages/pyright-internal/src/analyzer/importStatementUtils.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { TokenType } from '../parser/tokenizerTypes';
3535
import * as AnalyzerNodeInfo from './analyzerNodeInfo';
3636
import { ModuleNameAndType } from './importResolver';
3737
import { ImportResult, ImportType } from './importResult';
38-
import { findTokenAfter, getTokenAt } from './parseTreeUtils';
38+
import { getTokenAfter, getTokenAt } from './parseTreeUtils';
3939
import * as SymbolNameUtils from './symbolNameUtils';
4040

4141
export interface ImportStatement {
@@ -797,8 +797,8 @@ function getEditsPreservingFirstCommentAfterCommaIfExist(
797797
return [{ start: offsetOfPreviousNodeEnd, length }];
798798
}
799799

800-
const commaToken = findTokenAfter(
801-
parseFileResults.tokenizerOutput,
800+
const commaToken = getTokenAfter(
801+
parseFileResults.tokenizerOutput.tokens,
802802
TextRange.getEnd(previousNode),
803803
(t) => t.type === TokenType.Comma
804804
);

‎packages/pyright-internal/src/analyzer/parseTreeUtils.ts

+29-18
Original file line numberDiff line numberDiff line change
@@ -1909,6 +1909,35 @@ export function getTokenAtLeft(
19091909
return tokens.getItemAt(index);
19101910
}
19111911

1912+
export function getTokenIndexAfter(
1913+
tokens: TextRangeCollection<Token>,
1914+
position: number,
1915+
predicate: (t: Token) => boolean
1916+
) {
1917+
const index = tokens.getItemAtPosition(position);
1918+
if (index < 0) {
1919+
return -1;
1920+
}
1921+
1922+
for (let i = index; i < tokens.length; i++) {
1923+
const token = tokens.getItemAt(i);
1924+
if (predicate(token)) {
1925+
return i;
1926+
}
1927+
}
1928+
1929+
return -1;
1930+
}
1931+
1932+
export function getTokenAfter(tokens: TextRangeCollection<Token>, position: number, predicate: (t: Token) => boolean) {
1933+
const index = getTokenIndexAfter(tokens, position, predicate);
1934+
if (index < 0) {
1935+
return undefined;
1936+
}
1937+
1938+
return tokens.getItemAt(index);
1939+
}
1940+
19121941
export function isWhitespace(token: Token) {
19131942
return token.type === TokenType.NewLine || token.type === TokenType.Indent || token.type === TokenType.Dedent;
19141943
}
@@ -1941,24 +1970,6 @@ export function getIndexOfTokenOverlapping(tokens: TextRangeCollection<Token>, p
19411970
return TextRange.overlaps(token, position) ? index : -1;
19421971
}
19431972

1944-
export function findTokenAfter(tokenizerOutput: TokenizerOutput, offset: number, predicate: (t: Token) => boolean) {
1945-
const tokens = tokenizerOutput.tokens;
1946-
1947-
const index = tokens.getItemAtPosition(offset);
1948-
if (index < 0) {
1949-
return undefined;
1950-
}
1951-
1952-
for (let i = index; i < tokens.length; i++) {
1953-
const token = tokens.getItemAt(i);
1954-
if (predicate(token)) {
1955-
return token;
1956-
}
1957-
}
1958-
1959-
return undefined;
1960-
}
1961-
19621973
export function getCommentsAtTokenIndex(tokens: TextRangeCollection<Token>, index: number) {
19631974
let token = getTokenAtIndex(tokens, index);
19641975
if (!token) {

‎packages/pyright-internal/src/languageService/autoImporter.ts

+31-19
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,21 @@ import { IndexAliasData } from './symbolIndexer';
4242
import { fromLSPAny } from '../common/lspUtils';
4343

4444
export interface AutoImportSymbol {
45-
readonly importAlias?: IndexAliasData;
46-
readonly symbol?: Symbol;
45+
readonly name: string;
46+
readonly library: boolean;
47+
4748
readonly kind?: SymbolKind;
4849
readonly itemKind?: CompletionItemKind;
50+
readonly importAlias?: IndexAliasData;
51+
52+
readonly symbol?: Symbol;
4953
readonly inDunderAll?: boolean;
5054
readonly hasRedundantAlias?: boolean;
5155
}
5256

5357
export interface ModuleSymbolTable {
5458
readonly uri: Uri;
55-
getSymbols(): Generator<{ symbol: AutoImportSymbol; name: string; library: boolean }>;
59+
getSymbols(): Generator<AutoImportSymbol>;
5660
}
5761

5862
export type ModuleSymbolMap = Map<string, ModuleSymbolTable>;
@@ -164,7 +168,14 @@ export function buildModuleSymbolsMap(files: readonly SourceFileInfo[]): ModuleS
164168
declaration.type === DeclarationType.Variable && !declaration.isConstant && !declaration.isFinal
165169
? SymbolKind.Variable
166170
: undefined;
167-
yield { symbol: { symbol, kind: variableKind }, name, library: !isUserCode(file) };
171+
172+
yield {
173+
name,
174+
symbol,
175+
kind: variableKind,
176+
library: !isUserCode(file),
177+
inDunderAll: symbol.isInDunderAll(),
178+
};
168179
}
169180
},
170181
});
@@ -351,14 +362,15 @@ export class AutoImporter {
351362
}
352363

353364
const dotCount = StringUtils.getCharacterCount(importSource, '.');
354-
for (const { symbol: autoImportSymbol, name } of topLevelSymbols.getSymbols()) {
355-
if (!this.shouldIncludeVariable(autoImportSymbol, name, fileProperties.isStub)) {
365+
for (const autoSymbol of topLevelSymbols.getSymbols()) {
366+
if (!this.shouldIncludeVariable(autoSymbol, fileProperties.isStub)) {
356367
continue;
357368
}
358369

359370
// For very short matching strings, we will require an exact match. Otherwise
360371
// we will tend to return a list that's too long. Once we get beyond two
361372
// characters, we can do a fuzzy match.
373+
const name = autoSymbol.name;
362374
const isSimilar = this._isSimilar(word, name, similarityLimit);
363375
if (!isSimilar) {
364376
continue;
@@ -370,9 +382,9 @@ export class AutoImporter {
370382
}
371383

372384
// We will collect all aliases and then process it later
373-
if (autoImportSymbol.importAlias) {
385+
if (autoSymbol.importAlias) {
374386
this._addToImportAliasMap(
375-
autoImportSymbol.importAlias,
387+
autoSymbol.importAlias,
376388
{
377389
importParts: {
378390
symbolName: name,
@@ -383,12 +395,12 @@ export class AutoImporter {
383395
moduleNameAndType,
384396
},
385397
importGroup,
386-
symbol: autoImportSymbol.symbol,
387-
kind: autoImportSymbol.importAlias.kind,
388-
itemKind: autoImportSymbol.importAlias.itemKind,
389-
inDunderAll: autoImportSymbol.inDunderAll,
390-
hasRedundantAlias: autoImportSymbol.hasRedundantAlias,
391-
fileUri: autoImportSymbol.importAlias.moduleUri,
398+
symbol: autoSymbol.symbol,
399+
kind: autoSymbol.importAlias.kind,
400+
itemKind: autoSymbol.importAlias.itemKind,
401+
inDunderAll: autoSymbol.inDunderAll,
402+
hasRedundantAlias: autoSymbol.hasRedundantAlias,
403+
fileUri: autoSymbol.importAlias.moduleUri,
392404
},
393405
importAliasMap
394406
);
@@ -407,9 +419,9 @@ export class AutoImporter {
407419
this._addResult(results, {
408420
name,
409421
alias: abbrFromUsers,
410-
symbol: autoImportSymbol.symbol,
422+
symbol: autoSymbol.symbol,
411423
source: importSource,
412-
kind: autoImportSymbol.itemKind ?? convertSymbolKindToCompletionItemKind(autoImportSymbol.kind),
424+
kind: autoSymbol.itemKind ?? convertSymbolKindToCompletionItemKind(autoSymbol.kind),
413425
insertionText: autoImportTextEdits.insertionText,
414426
edits: autoImportTextEdits.edits,
415427
declUri: moduleUri,
@@ -497,14 +509,14 @@ export class AutoImporter {
497509
return StringUtils.getStringComparer()(left.importParts.importName, right.importParts.importName);
498510
}
499511

500-
protected shouldIncludeVariable(autoImportSymbol: AutoImportSymbol, name: string, isStub: boolean) {
512+
protected shouldIncludeVariable(autoSymbol: AutoImportSymbol, isStub: boolean) {
501513
// If it is not a stub file and symbol is Variable, we only include it if
502514
// name is public constant or type alias
503-
if (isStub || autoImportSymbol.kind !== SymbolKind.Variable) {
515+
if (isStub || autoSymbol.kind !== SymbolKind.Variable) {
504516
return true;
505517
}
506518

507-
return SymbolNameUtils.isPublicConstantOrTypeAlias(name);
519+
return SymbolNameUtils.isPublicConstantOrTypeAlias(autoSymbol.name);
508520
}
509521

510522
private _addToImportAliasMap(

‎packages/pyright-internal/src/localization/package.nls.cs.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -815,10 +815,10 @@
815815
"unhashableType": "Typ „{type}“ nejde zatřiďovat",
816816
"uninitializedAbstractVariable": "Proměnná instance {name} je definovaná v abstraktní základní třídě {classType}, ale neinicializovala se",
817817
"unreachableExcept": "{exceptionType} je podtřídou {parentType}",
818-
"useDictInstead": "Označte typ slovníku pomocí Dict[T1, T2]",
819-
"useListInstead": "Použijte List[T] k označení typu seznamu (list) nebo Union[T1, T2] k označení typu sjednocení (union).",
820-
"useTupleInstead": "Použijte tuple[T1, ..., Tn] k označení typu řazené kolekce členů (tuple) nebo Union[T1, T2] k označení typu sjednocení (union).",
821-
"useTypeInstead": "Místo toho použít Type[T]",
818+
"useDictInstead": "Use dict[T1, T2] to indicate a dictionary type",
819+
"useListInstead": "Use list[T] to indicate a list type or T1 | T2 to indicate a union type",
820+
"useTupleInstead": "Use tuple[T1, ..., Tn] to indicate a tuple type or T1 | T2 to indicate a union type",
821+
"useTypeInstead": "Use type[T] instead",
822822
"varianceMismatchForClass": "Odchylka argumentu typu „{typeVarName}“ není kompatibilní se základní třídou „{className}“",
823823
"varianceMismatchForTypeAlias": "Rozptyl argumentu typu „{typeVarName}“ není kompatibilní s typem „{typeAliasParam}“"
824824
},

‎packages/pyright-internal/src/localization/package.nls.de.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -815,10 +815,10 @@
815815
"unhashableType": "Der Typ \"{type}\" kann nicht mit einem Hash erstellt werden.",
816816
"uninitializedAbstractVariable": "Die Instanzvariable \"{name}\" ist in einer abstrakten Basisklasse \"{classType}\" definiert, aber nicht initialisiert.",
817817
"unreachableExcept": "\"{exceptionType}\" ist eine Unterklasse von \"{parentType}\"",
818-
"useDictInstead": "Verwenden Sie Dict[T1, T2], um einen Wörterbuchtyp anzugeben.",
819-
"useListInstead": "Verwenden Sie List[T], um einen list Typ anzugeben, oder Union[T1, T2], um einen union-Typ anzugeben.",
820-
"useTupleInstead": "Verwenden Sie tuple[T1, ..., Tn], um einen tuple-Typ anzugeben, oder Union[T1, T2], um einen union-Typ anzugeben.",
821-
"useTypeInstead": "Stattdessen Type[T] verwenden",
818+
"useDictInstead": "Use dict[T1, T2] to indicate a dictionary type",
819+
"useListInstead": "Use list[T] to indicate a list type or T1 | T2 to indicate a union type",
820+
"useTupleInstead": "Use tuple[T1, ..., Tn] to indicate a tuple type or T1 | T2 to indicate a union type",
821+
"useTypeInstead": "Use type[T] instead",
822822
"varianceMismatchForClass": "Die Varianz des Typarguments \"{typeVarName}\" ist nicht mit der Basisklasse \"{className}\" kompatibel",
823823
"varianceMismatchForTypeAlias": "Die Varianz des Typarguments \"{typeVarName}\" ist nicht mit \"{typeAliasParam}\" kompatibel"
824824
},

‎packages/pyright-internal/src/localization/package.nls.es.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -815,10 +815,10 @@
815815
"unhashableType": "El tipo \"{type}\" no admite hash",
816816
"uninitializedAbstractVariable": "La variable de instancia \"{name}\" está definida en la clase base abstracta \"{classType} \" pero no inicializada.",
817817
"unreachableExcept": "\"{exceptionType}\" es una subclase de \"{parentType}\"",
818-
"useDictInstead": "Usar Dict[T1, T2] para indicar un tipo de diccionario",
819-
"useListInstead": "Usar List[T] para indicar un tipo de list o Union[T1, T2] para indicar un tipo de union",
820-
"useTupleInstead": "Utilice tuple[T1, ..., Tn] para indicar un tipo de tuple o Union[T1, T2] para indicar un tipo de union.",
821-
"useTypeInstead": "Utilice Type[T] en su lugar",
818+
"useDictInstead": "Use dict[T1, T2] to indicate a dictionary type",
819+
"useListInstead": "Use list[T] to indicate a list type or T1 | T2 to indicate a union type",
820+
"useTupleInstead": "Use tuple[T1, ..., Tn] to indicate a tuple type or T1 | T2 to indicate a union type",
821+
"useTypeInstead": "Use type[T] instead",
822822
"varianceMismatchForClass": "La varianza del argumento de tipo \"{typeVarName}\" no es compatible con la clase base \"{className}\"",
823823
"varianceMismatchForTypeAlias": "La varianza del argumento de tipo \"{typeVarName}\" no es compatible con \"{typeAliasParam}\""
824824
},

‎packages/pyright-internal/src/localization/package.nls.fr.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -815,10 +815,10 @@
815815
"unhashableType": "Le type \"{type}\" n'est pas hachable",
816816
"uninitializedAbstractVariable": "La variable d’instance « {name} » est définie dans la classe de base abstraite « {classType} » mais n’est pas initialisée",
817817
"unreachableExcept": "« {exceptionType} » est une sous-classe de « {parentType} »",
818-
"useDictInstead": "Utilisez Dict[T1, T2] pour indiquer un type de dictionnaire",
819-
"useListInstead": "Utilisez List[T] pour indiquer un type de liste ou Union[T1, T2] pour indiquer un type d'union",
820-
"useTupleInstead": "Utiliser tuple[T1, ..., Tn] pour indiquer un type de tuple ou Union[T1, T2] pour indiquer un type d’union",
821-
"useTypeInstead": "Utiliser le Type[T] à la place",
818+
"useDictInstead": "Use dict[T1, T2] to indicate a dictionary type",
819+
"useListInstead": "Use list[T] to indicate a list type or T1 | T2 to indicate a union type",
820+
"useTupleInstead": "Use tuple[T1, ..., Tn] to indicate a tuple type or T1 | T2 to indicate a union type",
821+
"useTypeInstead": "Use type[T] instead",
822822
"varianceMismatchForClass": "La variance de l'argument de type \"{typeVarName}\" est incompatible avec la classe de base \"{className}\"",
823823
"varianceMismatchForTypeAlias": "La variance de l'argument de type \"{typeVarName}\" est incompatible avec \"{typeAliasParam}\""
824824
},

‎packages/pyright-internal/src/localization/package.nls.it.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -815,10 +815,10 @@
815815
"unhashableType": "Il tipo \"{type}\" non è hashable",
816816
"uninitializedAbstractVariable": "La variabile di istanza \"{name}\" è definita nella classe di base astratta \"{classType}\" ma non è inizializzata",
817817
"unreachableExcept": "\"{exceptionType}\" è una sottoclasse di \"{parentType}\"",
818-
"useDictInstead": "Usare Dict[T1, T2] per indicare un tipo di dizionario",
819-
"useListInstead": "Usare List[T] per indicare un tipo di list o Union[T1, T2] per indicare un tipo di unione",
820-
"useTupleInstead": "Usare tuple[T1, ..., Tn] per indicare un tipo di tuple o Union[T1, T2] per indicare un tipo di unione",
821-
"useTypeInstead": "In alternativa, usare Type[T]",
818+
"useDictInstead": "Use dict[T1, T2] to indicate a dictionary type",
819+
"useListInstead": "Use list[T] to indicate a list type or T1 | T2 to indicate a union type",
820+
"useTupleInstead": "Use tuple[T1, ..., Tn] to indicate a tuple type or T1 | T2 to indicate a union type",
821+
"useTypeInstead": "Use type[T] instead",
822822
"varianceMismatchForClass": "La varianza dell'argomento tipo \"{typeVarName}\" non è compatibile con la classe di base \"{className}\"",
823823
"varianceMismatchForTypeAlias": "La varianza dell'argomento tipo \"{typeVarName}\" non è compatibile con \"{typeAliasParam}\""
824824
},

‎packages/pyright-internal/src/localization/package.nls.ja.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -815,10 +815,10 @@
815815
"unhashableType": "型 \"{type}\" はハッシュ可能ではありません",
816816
"uninitializedAbstractVariable": "インスタンス変数 \"{name}\" は抽象基本クラス \"{classType}\" で定義されていますが、初期化されていません",
817817
"unreachableExcept": "\"{exceptionType}\" は \"{parentType}\" のサブクラスです",
818-
"useDictInstead": "辞書の種類を示すには、Dict[T1, T2] を使用します",
819-
"useListInstead": "List[T] を使用して list 型を示すか、Union[T1, T2] を使用して union 型を示します",
820-
"useTupleInstead": "tuple[T1, ..., Tn] を使用して tuple 型を示すか、Union[T1, T2] を使用して union 型を示します",
821-
"useTypeInstead": "代わりに Type[T] を使用する",
818+
"useDictInstead": "Use dict[T1, T2] to indicate a dictionary type",
819+
"useListInstead": "Use list[T] to indicate a list type or T1 | T2 to indicate a union type",
820+
"useTupleInstead": "Use tuple[T1, ..., Tn] to indicate a tuple type or T1 | T2 to indicate a union type",
821+
"useTypeInstead": "Use type[T] instead",
822822
"varianceMismatchForClass": "型引数 \"{typeVarName}\" の分散は、基底クラス \"{className}\" と互換性がありません",
823823
"varianceMismatchForTypeAlias": "型引数 \"{typeVarName}\" の分散は \"{typeAliasParam}\" と互換性がありません"
824824
},

‎packages/pyright-internal/src/localization/package.nls.ko.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -815,10 +815,10 @@
815815
"unhashableType": "‘{type}’ 형식을 해시할 수 없습니다.",
816816
"uninitializedAbstractVariable": "인스턴스 변수 \"{name}\"이(가) 추상 기본 클래스 \"{classType}\"에 정의되어 있지만 초기화되지 않았습니다.",
817817
"unreachableExcept": "\"{exceptionType}\"은(는) \"{parentType}\"의 서브클래스입니다.",
818-
"useDictInstead": "사전 형식을 나타내려면 Dict[T1, T2]를 사용하세요.",
819-
"useListInstead": "List[T]를 사용하여 list 형식을 나타내거나 Union[T1, T2]를 사용하여 union 형식을 나타내세요.",
820-
"useTupleInstead": "tuple[T1, ..., Tn]을 사용하여 tuple 형식을 나타내거나 Union[T1, T2]을 사용하여 union 형식을 나타냅니다.",
821-
"useTypeInstead": "대신 Type[T] 사용",
818+
"useDictInstead": "Use dict[T1, T2] to indicate a dictionary type",
819+
"useListInstead": "Use list[T] to indicate a list type or T1 | T2 to indicate a union type",
820+
"useTupleInstead": "Use tuple[T1, ..., Tn] to indicate a tuple type or T1 | T2 to indicate a union type",
821+
"useTypeInstead": "Use type[T] instead",
822822
"varianceMismatchForClass": "‘{typeVarName}’ 형식 인수의 차이는 ‘{className}’ 기본 클래스와 호환되지 않습니다.",
823823
"varianceMismatchForTypeAlias": "‘{typeVarName}’ 형식 인수의 차이는 ‘{typeAliasParam}’와(과) 호환되지 않습니다."
824824
},

0 commit comments

Comments
 (0)