Skip to content

Commit 6f28123

Browse files
Razmo99JustinGrote
authored andcommitted
added logging. Now using forof. throw instead of promise.reject. removed unused exports
1 parent 6a27fd8 commit 6f28123

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<IPower
152152
new RemoteFilesFeature(),
153153
new DebugSessionFeature(context, sessionManager, logger),
154154
new HelpCompletionFeature(),
155-
new RenameSymbolFeature(documentSelector)
155+
new RenameSymbolFeature(documentSelector,logger)
156156
];
157157

158158
sessionManager.setLanguageClientConsumers(languageClientConsumers);

src/features/RenameSymbol.ts

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { RequestType } from "vscode-languageclient";
66
import { LanguageClientConsumer } from "../languageClientConsumer";
77
import { RenameProvider, WorkspaceEdit, TextDocument, CancellationToken, Position,Uri,Range, DocumentSelector } from "vscode";
88
import { LanguageClient } from "vscode-languageclient/node";
9+
import { ILogger } from "../logging";
910
// eslint-disable-next-line @typescript-eslint/no-empty-interface
1011
interface IRenameSymbolRequestArguments {
1112
FileName?:string
@@ -42,14 +43,15 @@ interface IPrepareRenameSymbolRequestResponse {
4243
message : string
4344
}
4445

45-
export const RenameSymbolRequestType = new RequestType<IRenameSymbolRequestArguments, IRenameSymbolRequestResponse, void>("powerShell/renameSymbol");
46-
export const PrepareRenameSymbolRequestType = new RequestType<IPrepareRenameSymbolRequestArguments, IPrepareRenameSymbolRequestResponse, void>("powerShell/PrepareRenameSymbol");
46+
const RenameSymbolRequestType = new RequestType<IRenameSymbolRequestArguments, IRenameSymbolRequestResponse, void>("powerShell/renameSymbol");
47+
const PrepareRenameSymbolRequestType = new RequestType<IPrepareRenameSymbolRequestArguments, IPrepareRenameSymbolRequestResponse, void>("powerShell/PrepareRenameSymbol");
4748

4849
export class RenameSymbolFeature extends LanguageClientConsumer implements RenameProvider {
4950
private languageRenameProvider:vscode.Disposable;
5051

51-
constructor(documentSelector:DocumentSelector){
52+
constructor(documentSelector:DocumentSelector,private logger: ILogger){
5253
super();
54+
5355
this.languageRenameProvider = vscode.languages.registerRenameProvider(documentSelector,this);
5456
}
5557
// eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -72,15 +74,16 @@ export class RenameSymbolFeature extends LanguageClientConsumer implements Renam
7274
}
7375

7476
const edit = new WorkspaceEdit();
75-
response.changes.forEach(change => {
76-
const uri = Uri.file(change.fileName);
77+
for (const file of response.changes) {
78+
79+
const uri = Uri.file(file.fileName);
7780

78-
change.changes.forEach(change => {
81+
for (const change of file.changes) {
7982
edit.replace(uri,
8083
new Range(change.startLine, change.startColumn, change.endLine, change.endColumn),
8184
change.newText);
82-
});
83-
});
85+
}
86+
}
8487
return edit;
8588
}catch (error) {
8689
return undefined;
@@ -104,21 +107,22 @@ export class RenameSymbolFeature extends LanguageClientConsumer implements Renam
104107
}
105108
const wordRange = document.getWordRangeAtPosition(position);
106109
if (!wordRange) {
107-
return Promise.reject("Not a valid location for renaming.");
110+
throw new Error("Not a valid location for renaming.");
108111

109112
}
110113
const wordText = document.getText(wordRange);
111114
if (response.message) {
112-
return Promise.reject(response.message);
113-
115+
throw new Error(response.message);
114116
}
115117

116118
return {
117119
range: wordRange,
118120
placeholder: wordText
119121
};
120122
}catch (error) {
121-
return null;
123+
const msg = `RenameSymbol unhandled error: ${error}`;
124+
this.logger.writeError(msg);
125+
throw new Error(msg);
122126
}
123127
}
124128
public dispose(): void {

0 commit comments

Comments
 (0)