Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PylanceBot] Pull Pylance with Pyright 1.1.298 #4745

Merged
merged 1 commit into from
Mar 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/pyright-internal/src/analyzer/program.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2078,7 +2078,10 @@ export class Program {
}

// If this isn't a name node, there are no references to be found.
if (node.nodeType !== ParseNodeType.Name || !RenameModuleProvider.canMoveSymbol(this._evaluator!, node)) {
if (
node.nodeType !== ParseNodeType.Name ||
!RenameModuleProvider.canMoveSymbol(this._configOptions, this._evaluator!, node)
) {
return undefined;
}

Expand Down
112 changes: 112 additions & 0 deletions packages/pyright-internal/src/commands/dumpFileDebugInfoCommand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import {
BinaryOperationNode,
BreakNode,
CallNode,
CaseNode,
ClassNode,
ConstantNode,
ContinueNode,
Expand Down Expand Up @@ -71,6 +72,7 @@ import {
ListComprehensionIfNode,
ListComprehensionNode,
ListNode,
MatchNode,
MemberAccessNode,
ModuleNameNode,
ModuleNode,
Expand All @@ -82,6 +84,16 @@ import {
ParseNode,
ParseNodeType,
PassNode,
PatternAsNode,
PatternCaptureNode,
PatternClassArgumentNode,
PatternClassNode,
PatternLiteralNode,
PatternMappingExpandEntryNode,
PatternMappingKeyEntryNode,
PatternMappingNode,
PatternSequenceNode,
PatternValueNode,
RaiseNode,
ReturnNode,
SetNode,
Expand All @@ -93,7 +105,11 @@ import {
TernaryNode,
TryNode,
TupleNode,
TypeAliasNode,
TypeAnnotationNode,
TypeParameterCategory,
TypeParameterListNode,
TypeParameterNode,
UnaryOperationNode,
UnpackNode,
WhileNode,
Expand Down Expand Up @@ -911,6 +927,94 @@ class TreeDumper extends ParseTreeWalker {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitCase(node: CaseNode): boolean {
this._log(`${this._getPrefix(node)} isIrrefutable: ${node.isIrrefutable}`);
return true;
}

override visitMatch(node: MatchNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitPatternAs(node: PatternAsNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitPatternCapture(node: PatternCaptureNode): boolean {
this._log(`${this._getPrefix(node)} isStar:${node.isStar} isWildcard:${node.isWildcard}`);
return true;
}

override visitPatternClass(node: PatternClassNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitPatternClassArgument(node: PatternClassArgumentNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitPatternLiteral(node: PatternLiteralNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitPatternMapping(node: PatternMappingNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitPatternMappingExpandEntry(node: PatternMappingExpandEntryNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitPatternMappingKeyEntry(node: PatternMappingKeyEntryNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitPatternSequence(node: PatternSequenceNode): boolean {
this._log(`${this._getPrefix(node)} starEntryIndex: ${node.starEntryIndex}`);
return true;
}

override visitPatternValue(node: PatternValueNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitTypeAlias(node: TypeAliasNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}

override visitTypeParameter(node: TypeParameterNode): boolean {
this._log(
`${this._getPrefix(node)} typeParamCategory:${getTypeParameterCategoryString(node.typeParamCategory)}`
);
return true;
}

override visitTypeParameterList(node: TypeParameterListNode): boolean {
this._log(`${this._getPrefix(node)}`);
return true;
}
}

function getTypeParameterCategoryString(type: TypeParameterCategory) {
switch (type) {
case TypeParameterCategory.TypeVar:
return 'TypeVar';
case TypeParameterCategory.TypeVarTuple:
return 'TypeVarTuple';
case TypeParameterCategory.ParamSpec:
return 'ParamSpec';
}
}

function getParameterCategoryString(type: ParameterCategory) {
Expand Down Expand Up @@ -961,6 +1065,14 @@ function getErrorExpressionCategoryString(type: ErrorExpressionCategory) {
return 'MissingListCloseBracket';
case ErrorExpressionCategory.MissingFunctionParameterList:
return 'MissingFunctionParameterList';
case ErrorExpressionCategory.MissingPattern:
return 'MissingPattern';
case ErrorExpressionCategory.MissingPatternSubject:
return 'MissingPatternSubject';
case ErrorExpressionCategory.MissingDictValue:
return 'MissingDictValue';
case ErrorExpressionCategory.MaxDepthExceeded:
return 'MaxDepthExceeded';
default:
return `Unknown Value!! (${type})`;
}
Expand Down
27 changes: 26 additions & 1 deletion packages/pyright-internal/src/common/extensibility.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,35 @@ export namespace Extensions {
languageServiceExtensions = languageServiceExtensions.filter((s) => s.owner !== languageServer);
}

function getBestProgram(filePath: string): ProgramView {
// Find the best program to use for this file.
const programs = [...new Set<ProgramView>(programExtensions.map((s) => s.view))];
let bestProgram: ProgramView | undefined;
programs.forEach((program) => {
// If the file is tracked by this program, use it.
if (program.owns(filePath)) {
if (!bestProgram || filePath.startsWith(program.rootPath)) {
bestProgram = program;
}
}
});

// If we didn't find a program that tracks the file, use the first one that claims ownership.
if (bestProgram === undefined) {
if (programs.length === 1) {
bestProgram = programs[0];
} else {
bestProgram = programs.find((p) => p.getBoundSourceFileInfo(filePath)) || programs[0];
}
}
return bestProgram;
}

export function getProgramExtensions(nodeOrFilePath: ParseNode | string) {
const filePath =
typeof nodeOrFilePath === 'string' ? nodeOrFilePath.toString() : getFileInfo(nodeOrFilePath).filePath;
return programExtensions.filter((s) => s.view?.owns(filePath)) as ProgramExtension[];
const bestProgram = getBestProgram(filePath);
return programExtensions.filter((s) => s.view === bestProgram) as ProgramExtension[];
}

export function getLanguageServiceExtensions() {
Expand Down
4 changes: 3 additions & 1 deletion packages/pyright-internal/src/languageServerBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,9 @@ export abstract class LanguageServerBase implements LanguageServerInterface {
documentHighlightProvider: { workDoneProgress: true },
renameProvider: { prepareProvider: true, workDoneProgress: true },
completionProvider: {
triggerCharacters: this.client.hasVisualStudioExtensionsCapability ? ['.', '[', '@'] : ['.', '['],
triggerCharacters: this.client.hasVisualStudioExtensionsCapability
? ['.', '[', '@', '"', "'"]
: ['.', '[', '"', "'"],
resolveProvider: true,
workDoneProgress: true,
completionItem: {
Expand Down
Loading