development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

polishing the code after review

Browse source
This commit is contained in:
Aiday Marlen Kyzy 2023-11-21 15:42:14 +01:00
parent e46541edaf
commit 5e89263580
No known key found for this signature in database
GPG key ID: 24A8B53DBD26FF4E
2 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/typescript-language-features/src/languageFeatures/documentSymbol.ts
View file

@ -12,7 +12,7 @@ import * as PConst from '../tsServer/protocol/protocol.const';
import * as typeConverters from '../typeConverters';
import { ITypeScriptServiceClient } from '../typescriptService';
export const getSymbolKind = (kind: string): vscode.SymbolKind => {
const getSymbolKind = (kind: string): vscode.SymbolKind => {
switch (kind) {
case PConst.Kind.module: return vscode.SymbolKind.Module;
case PConst.Kind.class: return vscode.SymbolKind.Class;

51
extensions/typescript-language-features/src/languageFeatures/refactor.ts
View file

@ -21,7 +21,7 @@ import { nulToken } from '../utils/cancellation';
import FormattingOptionsManager from './fileConfigurationManager';
import { conditionalRegistration, requireSomeCapability } from './util/dependentRegistration';
import { EditorChatFollowUp, EditorChatFollowUp_Args, CompositeCommand } from './util/copilot';
import { getSymbolKind } from './documentSymbol';
import * as PConst from '../tsServer/protocol/protocol.const';
function toWorkspaceEdit(client: ITypeScriptServiceClient, edits: readonly Proto.FileCodeEdits[]): vscode.WorkspaceEdit {
const workspaceEdit = new vscode.WorkspaceEdit();
@ -437,30 +437,11 @@ class MoveToFileCodeAction extends vscode.CodeAction {
};
}
private static readonly _scopesOfInterest = [
vscode.SymbolKind.File,
vscode.SymbolKind.Module,
vscode.SymbolKind.Namespace,
vscode.SymbolKind.Package,
vscode.SymbolKind.Class,
vscode.SymbolKind.Interface,
];
private static _findSmallestNavTreeContaining(
navigationTree: Proto.NavigationTree,
range: vscode.Range
): Proto.NavigationTree {
const childTrees = navigationTree.childItems;
if (!childTrees) {
return navigationTree;
}
for (const childTree of childTrees) {
if (MoveToFileCodeAction._navTreeContainsRange(childTree, range) && MoveToFileCodeAction._scopesOfInterest.includes(getSymbolKind(childTree.kind))) {
return this._findSmallestNavTreeContaining(childTree, range);
}
}
return navigationTree;
}
private static readonly _scopesOfInterest = new Set([
PConst.Kind.module,
PConst.Kind.class,
PConst.Kind.interface
]);
private static _navTreeContainsRange(navigationTree: Proto.NavigationTree, range: vscode.Range): boolean {
return navigationTree.spans.some(span => typeConverters.Range.fromTextSpan(span).contains(range));
@ -473,10 +454,22 @@ class MoveToFileCodeAction extends vscode.CodeAction {
if (!navigationTree || !MoveToFileCodeAction._navTreeContainsRange(navigationTree, range)) {
return false;
}
const smallestScopeContaining = MoveToFileCodeAction._findSmallestNavTreeContaining(navigationTree, range);
return !!(smallestScopeContaining
&& smallestScopeContaining.spans[0].start.line - 1 === range.start.line
&& smallestScopeContaining.spans[smallestScopeContaining.spans.length - 1].end.line - 1 === range.end.line);
return MoveToFileCodeAction._shouldIncludeMoveToAction(navigationTree, range);
}
private static _shouldIncludeMoveToAction(
navigationTree: Proto.NavigationTree,
range: vscode.Range
): boolean {
const childTrees = navigationTree.childItems;
if (childTrees) {
for (const childTree of childTrees) {
if (MoveToFileCodeAction._navTreeContainsRange(childTree, range) && MoveToFileCodeAction._scopesOfInterest.has(childTree.kind)) {
return this._shouldIncludeMoveToAction(childTree, range);
}
}
}
return !!navigationTree.nameSpan && typeConverters.Range.fromTextSpan(navigationTree.nameSpan).contains(range);
}
}