Skip to content

Commit ffc5229

Browse files
DustinCampbellDustinCampbell
authored
Merge pull request #791 from DustinCampbell/fix-tabs-and-spaces
Fix tabs and spaces
2 parents 8ed3f91 + a0cafe9 commit ffc5229

22 files changed

+921
-924
lines changed

‎src/features/abstractProvider.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ import {Disposable} from 'vscode';
1010

1111
export default class AbstractProvider {
1212

13-
protected _server: OmnisharpServer;
14-
protected _disposables: Disposable[];
13+
protected _server: OmnisharpServer;
14+
protected _disposables: Disposable[];
1515

16-
constructor(server: OmnisharpServer) {
17-
this._server = server;
18-
this._disposables = [];
19-
}
16+
constructor(server: OmnisharpServer) {
17+
this._server = server;
18+
this._disposables = [];
19+
}
2020

21-
dispose() {
22-
while (this._disposables.length) {
23-
this._disposables.pop().dispose();
24-
}
25-
}
21+
dispose() {
22+
while (this._disposables.length) {
23+
this._disposables.pop().dispose();
24+
}
25+
}
2626
}

‎src/features/changeForwarding.ts‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,51 @@ import * as serverUtils from '../omnisharp/utils';
1111

1212
function forwardDocumentChanges(server: OmnisharpServer): Disposable {
1313

14-
return workspace.onDidChangeTextDocument(event => {
15-
16-
let {document} = event;
17-
if (document.isUntitled || document.languageId !== 'csharp') {
18-
return;
19-
}
20-
21-
if (!server.isRunning()) {
22-
return;
23-
}
24-
25-
serverUtils.updateBuffer(server, {Buffer: document.getText(), Filename: document.fileName}).catch(err => {
26-
console.error(err);
27-
return err;
28-
});
29-
});
14+
return workspace.onDidChangeTextDocument(event => {
15+
16+
let {document} = event;
17+
if (document.isUntitled || document.languageId !== 'csharp') {
18+
return;
19+
}
20+
21+
if (!server.isRunning()) {
22+
return;
23+
}
24+
25+
serverUtils.updateBuffer(server, {Buffer: document.getText(), Filename: document.fileName}).catch(err => {
26+
console.error(err);
27+
return err;
28+
});
29+
});
3030
}
3131

3232
function forwardFileChanges(server: OmnisharpServer): Disposable {
3333

34-
function onFileSystemEvent(uri: Uri): void {
35-
if (!server.isRunning()) {
36-
return;
37-
}
34+
function onFileSystemEvent(uri: Uri): void {
35+
if (!server.isRunning()) {
36+
return;
37+
}
3838

39-
let req = { Filename: uri.fsPath };
39+
let req = { Filename: uri.fsPath };
4040

4141
serverUtils.filesChanged(server, [req]).catch(err => {
42-
console.warn(`[o] failed to forward file change event for ${uri.fsPath}`, err);
43-
return err;
44-
});
45-
}
42+
console.warn(`[o] failed to forward file change event for ${uri.fsPath}`, err);
43+
return err;
44+
});
45+
}
4646

47-
const watcher = workspace.createFileSystemWatcher('**/*.*');
48-
let d1 = watcher.onDidCreate(onFileSystemEvent);
49-
let d2 = watcher.onDidChange(onFileSystemEvent);
50-
let d3 = watcher.onDidDelete(onFileSystemEvent);
47+
const watcher = workspace.createFileSystemWatcher('**/*.*');
48+
let d1 = watcher.onDidCreate(onFileSystemEvent);
49+
let d2 = watcher.onDidChange(onFileSystemEvent);
50+
let d3 = watcher.onDidDelete(onFileSystemEvent);
5151

52-
return Disposable.from(watcher, d1, d2, d3);
52+
return Disposable.from(watcher, d1, d2, d3);
5353
}
5454

5555
export default function forwardChanges(server: OmnisharpServer): Disposable {
5656

57-
// combine file watching and text document watching
58-
return Disposable.from(
59-
forwardDocumentChanges(server),
60-
forwardFileChanges(server));
57+
// combine file watching and text document watching
58+
return Disposable.from(
59+
forwardDocumentChanges(server),
60+
forwardFileChanges(server));
6161
}

‎src/features/codeActionProvider.ts‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -14,84 +14,84 @@ import * as serverUtils from '../omnisharp/utils';
1414

1515
export default class OmnisharpCodeActionProvider extends AbstractProvider implements CodeActionProvider {
1616

17-
private _disabled: boolean;
18-
private _commandId: string;
19-
20-
constructor(server: OmnisharpServer) {
21-
super(server);
22-
this._commandId = 'omnisharp.runCodeAction';
23-
24-
this._updateEnablement();
25-
let d1 = workspace.onDidChangeConfiguration(this._updateEnablement, this);
26-
let d2 = commands.registerCommand(this._commandId, this._runCodeAction, this);
27-
this._disposables.push(d1, d2);
28-
}
29-
30-
private _updateEnablement(): void {
31-
let value = workspace.getConfiguration().get('csharp.disableCodeActions', false);
32-
this._disabled = value;
33-
}
34-
35-
public provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken): Promise<Command[]> {
36-
37-
if (this._disabled) {
38-
return;
39-
}
40-
41-
let req: protocol.V2.GetCodeActionsRequest = {
42-
Filename: document.fileName,
43-
Selection: OmnisharpCodeActionProvider._asRange(range)
44-
};
45-
46-
return serverUtils.getCodeActions(this._server, req, token).then(response => {
47-
return response.CodeActions.map(codeAction => {
48-
return {
49-
title: codeAction.Name,
50-
command: this._commandId,
51-
arguments: [<protocol.V2.RunCodeActionRequest>{
52-
Filename: document.fileName,
53-
Selection: OmnisharpCodeActionProvider._asRange(range),
54-
Identifier: codeAction.Identifier,
55-
WantsTextChanges: true
56-
}]
57-
};
58-
});
59-
}, (error) => {
60-
return Promise.reject(`Problem invoking 'GetCodeActions' on OmniSharp server: ${error}`);
61-
});
62-
}
63-
64-
private _runCodeAction(req: protocol.V2.RunCodeActionRequest): Promise<any> {
65-
66-
return serverUtils.runCodeAction(this._server, req).then(response => {
67-
68-
if (response && Array.isArray(response.Changes)) {
69-
70-
let edit = new WorkspaceEdit();
71-
72-
for (let change of response.Changes) {
73-
let uri = Uri.file(change.FileName);
74-
let edits: TextEdit[] = [];
75-
for (let textChange of change.Changes) {
76-
edits.push(TextEdit.replace(toRange2(textChange), textChange.NewText));
77-
}
78-
79-
edit.set(uri, edits);
80-
}
81-
82-
return workspace.applyEdit(edit);
83-
}
84-
85-
}, (error) => {
86-
return Promise.reject('Problem invoking \'RunCodeAction\' on OmniSharp server: ' + error);
87-
});
88-
}
89-
90-
private static _asRange(range: Range): protocol.V2.Range {
91-
let {start, end} = range;
92-
return {
93-
Start: { Line: start.line + 1, Column: start.character + 1 },
94-
End: { Line: end.line + 1, Column: end.character + 1 }
95-
};
96-
}
17+
private _disabled: boolean;
18+
private _commandId: string;
19+
20+
constructor(server: OmnisharpServer) {
21+
super(server);
22+
this._commandId = 'omnisharp.runCodeAction';
23+
24+
this._updateEnablement();
25+
let d1 = workspace.onDidChangeConfiguration(this._updateEnablement, this);
26+
let d2 = commands.registerCommand(this._commandId, this._runCodeAction, this);
27+
this._disposables.push(d1, d2);
28+
}
29+
30+
private _updateEnablement(): void {
31+
let value = workspace.getConfiguration().get('csharp.disableCodeActions', false);
32+
this._disabled = value;
33+
}
34+
35+
public provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken): Promise<Command[]> {
36+
37+
if (this._disabled) {
38+
return;
39+
}
40+
41+
let req: protocol.V2.GetCodeActionsRequest = {
42+
Filename: document.fileName,
43+
Selection: OmnisharpCodeActionProvider._asRange(range)
44+
};
45+
46+
return serverUtils.getCodeActions(this._server, req, token).then(response => {
47+
return response.CodeActions.map(codeAction => {
48+
return {
49+
title: codeAction.Name,
50+
command: this._commandId,
51+
arguments: [<protocol.V2.RunCodeActionRequest>{
52+
Filename: document.fileName,
53+
Selection: OmnisharpCodeActionProvider._asRange(range),
54+
Identifier: codeAction.Identifier,
55+
WantsTextChanges: true
56+
}]
57+
};
58+
});
59+
}, (error) => {
60+
return Promise.reject(`Problem invoking 'GetCodeActions' on OmniSharp server: ${error}`);
61+
});
62+
}
63+
64+
private _runCodeAction(req: protocol.V2.RunCodeActionRequest): Promise<any> {
65+
66+
return serverUtils.runCodeAction(this._server, req).then(response => {
67+
68+
if (response && Array.isArray(response.Changes)) {
69+
70+
let edit = new WorkspaceEdit();
71+
72+
for (let change of response.Changes) {
73+
let uri = Uri.file(change.FileName);
74+
let edits: TextEdit[] = [];
75+
for (let textChange of change.Changes) {
76+
edits.push(TextEdit.replace(toRange2(textChange), textChange.NewText));
77+
}
78+
79+
edit.set(uri, edits);
80+
}
81+
82+
return workspace.applyEdit(edit);
83+
}
84+
85+
}, (error) => {
86+
return Promise.reject('Problem invoking \'RunCodeAction\' on OmniSharp server: ' + error);
87+
});
88+
}
89+
90+
private static _asRange(range: Range): protocol.V2.Range {
91+
let {start, end} = range;
92+
return {
93+
Start: { Line: start.line + 1, Column: start.character + 1 },
94+
End: { Line: end.line + 1, Column: end.character + 1 }
95+
};
96+
}
9797
}

0 commit comments

Comments
 (0)