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.

Sign up for GitHub

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

Jump to bottom

Remove unused declarations array in extractSymbol's TargetRange #51091

Merged
merged 1 commit into from Oct 10, 2022
Merged

Remove unused declarations array in extractSymbol's TargetRange #51091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 2 additions & 10 deletions src/services/refactors/extractSymbol.ts
View file
Open in desktop
Expand Up @@ -239,11 +239,6 @@ namespace ts.refactor.extractSymbol {
interface TargetRange {
readonly range: Expression | Statement[];
readonly facts: RangeFacts;
/**
* A list of symbols that are declared in the selected range which are visible in the containing lexical scope
* Used to ensure we don't turn something used outside the range free (or worse, resolve to a different entity).
*/
readonly declarations: Symbol[];
/**
* If `this` is referring to a function instead of class, we need to retrieve its type.
*/
Expand Down Expand Up @@ -294,8 +289,6 @@ namespace ts.refactor.extractSymbol {
// Do the same for the ending position
const end = cursorRequest ? start : getParentNodeInSpan(endToken, sourceFile, adjustedSpan);

const declarations: Symbol[] = [];

// We'll modify these flags as we walk the tree to collect data
// about what things need to be done as part of the extraction.
let rangeFacts = RangeFacts.None;
Expand Down Expand Up @@ -344,7 +337,7 @@ namespace ts.refactor.extractSymbol {
return { errors: [createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
}

return { targetRange: { range: statements, facts: rangeFacts, declarations, thisNode } };
return { targetRange: { range: statements, facts: rangeFacts, thisNode } };
}

if (isReturnStatement(start) && !start.expression) {
Expand All @@ -359,7 +352,7 @@ namespace ts.refactor.extractSymbol {
if (errors) {
return { errors };
}
return { targetRange: { range: getStatementOrExpressionRange(node)!, facts: rangeFacts, declarations, thisNode } }; // TODO: GH#18217
return { targetRange: { range: getStatementOrExpressionRange(node)!, facts: rangeFacts, thisNode } }; // TODO: GH#18217

/**
* Attempt to refine the extraction node (generally, by shrinking it) to produce better results.
Expand Down Expand Up @@ -489,7 +482,6 @@ namespace ts.refactor.extractSymbol {
(errors ||= []).push(createDiagnosticForNode(node, Messages.cannotExtractExportedEntity));
return true;
}
declarations.push(node.symbol);
}

// Some things can't be extracted in certain situations
Expand Down