mirror of
https://github.com/microsoft/TypeScript.git
synced 2025-11-18 17:21:48 +00:00
Added skipDestructiveCodeActions argument to organize imports server command (#43184)
* Stopped removing unused imports in files with syntactic errors * Added allowDestructiveCodeActions arg * Updated .d.ts baselines * Stop factoring syntax errors. Weird that no tests break... * Have args extend scope so it is not a breaking change * Update src/harness/harnessLanguageService.ts Co-authored-by: Jesse Trinity <jetrinit@microsoft.com> * Fixed API breaking change, and renamed to skip * Always with the baselines * One more .d.ts baseline to fix * Remove blank line in src/harness/harnessLanguageService.ts Co-authored-by: Jesse Trinity <jetrinit@microsoft.com>
This commit is contained in:
co-authored by
Jesse Trinity
parent
f67ee44379
commit
a910c8df13
@@ -681,6 +681,7 @@ namespace ts.server.protocol {
|
||||
|
||||
export interface OrganizeImportsRequestArgs {
|
||||
scope: OrganizeImportsScope;
|
||||
skipDestructiveCodeActions?: boolean;
|
||||
}
|
||||
|
||||
export interface OrganizeImportsResponse extends Response {
|
||||
|
||||
+12
-4
@@ -2201,10 +2201,18 @@ namespace ts.server {
|
||||
}
|
||||
}
|
||||
|
||||
private organizeImports({ scope }: protocol.OrganizeImportsRequestArgs, simplifiedResult: boolean): readonly protocol.FileCodeEdits[] | readonly FileTextChanges[] {
|
||||
Debug.assert(scope.type === "file");
|
||||
const { file, project } = this.getFileAndProject(scope.args);
|
||||
const changes = project.getLanguageService().organizeImports({ type: "file", fileName: file }, this.getFormatOptions(file), this.getPreferences(file));
|
||||
private organizeImports(args: protocol.OrganizeImportsRequestArgs, simplifiedResult: boolean): readonly protocol.FileCodeEdits[] | readonly FileTextChanges[] {
|
||||
Debug.assert(args.scope.type === "file");
|
||||
const { file, project } = this.getFileAndProject(args.scope.args);
|
||||
const changes = project.getLanguageService().organizeImports(
|
||||
{
|
||||
fileName: file,
|
||||
skipDestructiveCodeActions: args.skipDestructiveCodeActions,
|
||||
type: "file",
|
||||
},
|
||||
this.getFormatOptions(file),
|
||||
this.getPreferences(file)
|
||||
);
|
||||
if (simplifiedResult) {
|
||||
return this.mapTextChangesToCodeEdits(changes);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user