Skip to content

Commit 1dc735d

Browse files
akshita31akshita31
committed
Rename to option provider
1 parent afe0d3e commit 1dc735d

File tree

8 files changed

+34
-34
lines changed

8 files changed

+34
-34
lines changed

‎src/features/codeActionProvider.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@ import * as serverUtils from '../omnisharp/utils';
1212
import { FileModificationType } from '../omnisharp/protocol';
1313
import { Uri } from 'vscode';
1414
import CompositeDisposable from '../CompositeDisposable';
15-
import { OptionObserver } from '../observers/OptionObserver';
15+
import OptionProvider from '../observers/OptionProvider';
1616

1717
export default class CodeActionProvider extends AbstractProvider implements vscode.CodeActionProvider {
1818

1919
private _commandId: string;
2020

21-
constructor(server: OmniSharpServer, private optionObserver: OptionObserver) {
21+
constructor(server: OmniSharpServer, private optionProvider: OptionProvider) {
2222
super(server);
2323
this._commandId = 'omnisharp.runCodeAction';
2424
let registerCommandDisposable = vscode.commands.registerCommand(this._commandId, this._runCodeAction, this);
2525
this.addDisposables(new CompositeDisposable(registerCommandDisposable));
2626
}
2727

2828
public async provideCodeActions(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken): Promise<vscode.Command[]> {
29-
let options = this.optionObserver.Options();
29+
let options = this.optionProvider.GetLatestOptions();
3030
if (options.disableCodeActions) {
3131
return;
3232
}

‎src/features/codeLensProvider.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import AbstractProvider from './abstractProvider';
1111
import { OmniSharpServer } from '../omnisharp/server';
1212
import { Options } from '../omnisharp/options';
1313
import TestManager from './dotnetTest';
14-
import { OptionObserver } from '../observers/OptionObserver';
14+
import OptionProvider from '../observers/OptionProvider';
1515

1616
class OmniSharpCodeLens extends vscode.CodeLens {
1717

@@ -25,7 +25,7 @@ class OmniSharpCodeLens extends vscode.CodeLens {
2525

2626
export default class OmniSharpCodeLensProvider extends AbstractProvider implements vscode.CodeLensProvider {
2727

28-
constructor(server: OmniSharpServer, testManager: TestManager, private optionObserver: OptionObserver) {
28+
constructor(server: OmniSharpServer, testManager: TestManager, private optionProvider: OptionProvider) {
2929
super(server);
3030

3131
}
@@ -38,7 +38,7 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
3838
};
3939

4040
async provideCodeLenses(document: vscode.TextDocument, token: vscode.CancellationToken) {
41-
let options = this.optionObserver.Options();
41+
let options = this.optionProvider.GetLatestOptions();
4242
if (!options.showReferencesCodeLens && !options.showTestsCodeLens) {
4343
return [];
4444
}

‎src/features/commands.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import { CommandShowOutput, CommandDotNetRestoreStart, CommandDotNetRestoreProgr
1818
import { EventStream } from '../EventStream';
1919
import { PlatformInformation } from '../platform';
2020
import CompositeDisposable from '../CompositeDisposable';
21-
import { OptionObserver } from '../observers/OptionObserver';
21+
import OptionProvider from '../observers/OptionProvider';
2222

23-
export default function registerCommands(server: OmniSharpServer, platformInfo: PlatformInformation, eventStream: EventStream, optionObserver: OptionObserver): CompositeDisposable {
23+
export default function registerCommands(server: OmniSharpServer, platformInfo: PlatformInformation, eventStream: EventStream, optionProvider: OptionProvider): CompositeDisposable {
2424
let d1 = vscode.commands.registerCommand('o.restart', () => restartOmniSharp(server));
25-
let d2 = vscode.commands.registerCommand('o.pickProjectAndStart', async () => pickProjectAndStart(server, optionObserver));
25+
let d2 = vscode.commands.registerCommand('o.pickProjectAndStart', async () => pickProjectAndStart(server, optionProvider));
2626
let d3 = vscode.commands.registerCommand('o.showOutput', () => eventStream.post(new CommandShowOutput()));
2727
let d4 = vscode.commands.registerCommand('dotnet.restore', fileName => {
2828
if (fileName) {
@@ -64,8 +64,8 @@ function restartOmniSharp(server: OmniSharpServer) {
6464
}
6565
}
6666

67-
async function pickProjectAndStart(server: OmniSharpServer, optionObserver: OptionObserver) {
68-
let options = optionObserver.Options();
67+
async function pickProjectAndStart(server: OmniSharpServer, optionObserver: OptionProvider) {
68+
let options = optionObserver.GetLatestOptions();
6969
return findLaunchTargets(options).then(targets => {
7070

7171
let currentPath = server.getSolutionPathOrFolder();

‎src/main.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import CSharpExtensionExports from './CSharpExtensionExports';
3131
import { vscodeNetworkSettingsProvider, NetworkSettingsProvider } from './NetworkSettings';
3232
import { ErrorMessageObserver } from './observers/ErrorMessageObserver';
3333
import OptionStream from './observables/OptionStream';
34-
import { OptionObserver } from './observers/OptionObserver';
34+
import OptionProvider from './observers/OptionProvider';
3535

3636
export async function activate(context: vscode.ExtensionContext): Promise<CSharpExtensionExports> {
3737

@@ -45,7 +45,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
4545

4646
const eventStream = new EventStream();
4747
const optionStream = new OptionStream(vscode);
48-
let optionObserver = new OptionObserver(optionStream);
48+
let optionProvider = new OptionProvider(optionStream);
4949

5050
let dotnetChannel = vscode.window.createOutputChannel('.NET');
5151
let dotnetChannelObserver = new DotNetChannelObserver(dotnetChannel);
@@ -65,7 +65,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
6565
eventStream.subscribe(omnisharpLogObserver.post);
6666
eventStream.subscribe(omnisharpChannelObserver.post);
6767

68-
let warningMessageObserver = new WarningMessageObserver(vscode, () => optionObserver.Options().disableMSBuildDiagnosticWarning || false);
68+
let warningMessageObserver = new WarningMessageObserver(vscode, () => optionProvider.GetLatestOptions().disableMSBuildDiagnosticWarning || false);
6969
eventStream.subscribe(warningMessageObserver.post);
7070

7171
let informationMessageObserver = new InformationMessageObserver(vscode);
@@ -103,7 +103,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
103103
let runtimeDependenciesExist = await ensureRuntimeDependencies(extension, eventStream, platformInfo, networkSettingsProvider);
104104

105105
// activate language services
106-
let omniSharpPromise = OmniSharp.activate(context, extension.packageJSON, platformInfo, networkSettingsProvider, eventStream, optionObserver);
106+
let omniSharpPromise = OmniSharp.activate(context, extension.packageJSON, platformInfo, networkSettingsProvider, eventStream, optionProvider);
107107

108108
// register JSON completion & hover providers for project.json
109109
context.subscriptions.push(addJSONProviders());

‎src/observers/OptionObserver.ts‎ renamed to ‎src/observers/OptionProvider.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import { Options } from "../omnisharp/options";
77
import OptionStream from "../observables/OptionStream";
88

9-
export class OptionObserver {
9+
export default class OptionProvider {
1010
private options: Options;
1111

1212
constructor(optionStream: OptionStream) {
1313
optionStream.subscribe(options => this.options = options);
1414
}
1515

16-
public Options(): Options {
16+
public GetLatestOptions(): Options {
1717
if (!this.options) {
1818
throw new Error("Error reading OmniSharp options");
1919
}

‎src/omnisharp/extension.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ import { EventStream } from '../EventStream';
3333
import { NetworkSettingsProvider } from '../NetworkSettings';
3434
import CompositeDisposable from '../CompositeDisposable';
3535
import Disposable from '../Disposable';
36-
import { OptionObserver } from '../observers/OptionObserver';
36+
import OptionProvider from '../observers/OptionProvider';
3737

3838
export let omnisharp: OmniSharpServer;
3939

40-
export async function activate(context: vscode.ExtensionContext, packageJSON: any, platformInfo: PlatformInformation, provider: NetworkSettingsProvider, eventStream: EventStream, optionObserver: OptionObserver) {
40+
export async function activate(context: vscode.ExtensionContext, packageJSON: any, platformInfo: PlatformInformation, provider: NetworkSettingsProvider, eventStream: EventStream, optionProvider: OptionProvider) {
4141
const documentSelector: vscode.DocumentSelector = {
4242
language: 'csharp',
4343
scheme: 'file' // only files from disk
4444
};
4545

46-
const options = optionObserver.Options();
47-
const server = new OmniSharpServer(vscode, provider, packageJSON, platformInfo, eventStream, optionObserver);
46+
const options = optionProvider.GetLatestOptions();
47+
const server = new OmniSharpServer(vscode, provider, packageJSON, platformInfo, eventStream, optionProvider);
4848
omnisharp = server;
4949
const advisor = new Advisor(server); // create before server is started
5050
const disposables = new CompositeDisposable();
@@ -62,7 +62,7 @@ export async function activate(context: vscode.ExtensionContext, packageJSON: an
6262
localDisposables.add(vscode.languages.registerImplementationProvider(documentSelector, new ImplementationProvider(server)));
6363
const testManager = new TestManager(server, eventStream);
6464
localDisposables.add(testManager);
65-
localDisposables.add(vscode.languages.registerCodeLensProvider(documentSelector, new CodeLensProvider(server, testManager, optionObserver)));
65+
localDisposables.add(vscode.languages.registerCodeLensProvider(documentSelector, new CodeLensProvider(server, testManager, optionProvider)));
6666
localDisposables.add(vscode.languages.registerDocumentHighlightProvider(documentSelector, new DocumentHighlightProvider(server)));
6767
localDisposables.add(vscode.languages.registerDocumentSymbolProvider(documentSelector, new DocumentSymbolProvider(server)));
6868
localDisposables.add(vscode.languages.registerReferenceProvider(documentSelector, new ReferenceProvider(server)));
@@ -75,7 +75,7 @@ export async function activate(context: vscode.ExtensionContext, packageJSON: an
7575
localDisposables.add(vscode.languages.registerCompletionItemProvider(documentSelector, new CompletionItemProvider(server), '.', ' '));
7676
localDisposables.add(vscode.languages.registerWorkspaceSymbolProvider(new WorkspaceSymbolProvider(server)));
7777
localDisposables.add(vscode.languages.registerSignatureHelpProvider(documentSelector, new SignatureHelpProvider(server), '(', ','));
78-
const codeActionProvider = new CodeActionProvider(server, optionObserver);
78+
const codeActionProvider = new CodeActionProvider(server, optionProvider);
7979
localDisposables.add(codeActionProvider);
8080
localDisposables.add(vscode.languages.registerCodeActionsProvider(documentSelector, codeActionProvider));
8181
localDisposables.add(reportDiagnostics(server, advisor));
@@ -90,7 +90,7 @@ export async function activate(context: vscode.ExtensionContext, packageJSON: an
9090
localDisposables = null;
9191
}));
9292

93-
disposables.add(registerCommands(server, platformInfo, eventStream, optionObserver));
93+
disposables.add(registerCommands(server, platformInfo, eventStream, optionProvider));
9494

9595
if (!context.workspaceState.get<boolean>('assetPromptDisabled')) {
9696
disposables.add(server.onServerStart(() => {

‎src/omnisharp/server.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { Subject } from 'rxjs/Subject';
2828
import 'rxjs/add/operator/debounceTime';
2929
import CompositeDisposable from '../CompositeDisposable';
3030
import Disposable from '../Disposable';
31-
import { OptionObserver } from '../observers/OptionObserver';
31+
import OptionProvider from '../observers/OptionProvider';
3232

3333
enum ServerState {
3434
Starting,
@@ -91,7 +91,7 @@ export class OmniSharpServer {
9191
private updateProjectDebouncer = new Subject<ObservableEvents.ProjectModified>();
9292
private firstUpdateProject: boolean;
9393

94-
constructor(private vscode: vscode, networkSettingsProvider: NetworkSettingsProvider, private packageJSON: any, private platformInfo: PlatformInformation, private eventStream: EventStream, private optionObserver: OptionObserver) {
94+
constructor(private vscode: vscode, networkSettingsProvider: NetworkSettingsProvider, private packageJSON: any, private platformInfo: PlatformInformation, private eventStream: EventStream, private optionProvider: OptionProvider) {
9595
this._requestQueue = new RequestQueueCollection(this.eventStream, 8, request => this._makeRequest(request));
9696
let downloader = new OmnisharpDownloader(networkSettingsProvider, this.eventStream, this.packageJSON, platformInfo);
9797
this._omnisharpManager = new OmnisharpManager(downloader, platformInfo);
@@ -416,13 +416,13 @@ export class OmniSharpServer {
416416
public async restart(launchTarget: LaunchTarget = this._launchTarget): Promise<void> {
417417
if (launchTarget) {
418418
await this.stop();
419-
const options = this.optionObserver.Options();
419+
const options = this.optionProvider.GetLatestOptions();
420420
await this._start(launchTarget, options);
421421
}
422422
}
423423

424424
public autoStart(preferredPath: string): Thenable<void> {
425-
const options = this.optionObserver.Options();
425+
const options = this.optionProvider.GetLatestOptions();
426426
return findLaunchTargets(options).then(async launchTargets => {
427427
// If there aren't any potential launch targets, we create file watcher and try to
428428
// start the server again once a *.sln, *.csproj, project.json, CSX or Cake file is created.

‎test/unitTests/OptionObserver/OptionObserver.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ import { getVSCodeWithConfig, updateConfig } from "../testAssets/Fakes";
88
import OptionStream from "../../../src/observables/OptionStream";
99
import { vscode, ConfigurationChangeEvent } from "../../../src/vscodeAdapter";
1010
import Disposable from "../../../src/Disposable";
11-
import { OptionObserver } from '../../../src/observers/OptionObserver';
11+
import OptionProvider from '../../../src/observers/OptionProvider';
1212

1313
suite('OptionStream', () => {
1414
suiteSetup(() => should());
1515

1616
let vscode: vscode;
1717
let listenerFunction: Array<(e: ConfigurationChangeEvent) => any>;
18-
let optionObserver: OptionObserver;
18+
let optionProvider: OptionProvider;
1919

2020
setup(() => {
2121
listenerFunction = new Array<(e: ConfigurationChangeEvent) => any>();
2222
vscode = getVSCode(listenerFunction);
2323
let optionStream = new OptionStream(vscode);
24-
optionObserver = new OptionObserver(optionStream);
24+
optionProvider = new OptionProvider(optionStream);
2525
});
2626

2727
test("Gives the default options if there is no change", () => {
28-
let options = optionObserver.Options();
28+
let options = optionProvider.GetLatestOptions();
2929
expect(options.path).to.be.null;
3030
options.useGlobalMono.should.equal("auto");
3131
options.waitForDebugger.should.equal(false);
@@ -45,15 +45,15 @@ suite('OptionStream', () => {
4545
let changingConfig = "omnisharp";
4646
updateConfig(vscode, changingConfig, 'path', "somePath");
4747
listenerFunction.forEach(listener => listener(getConfigChangeEvent(changingConfig)));
48-
let options = optionObserver.Options();
48+
let options = optionProvider.GetLatestOptions();
4949
expect(options.path).to.be.equal("somePath");
5050
});
5151

5252
test("Gives the latest options if there are changes in csharp config", () => {
5353
let changingConfig = 'csharp';
5454
updateConfig(vscode, changingConfig, 'disableCodeActions', true);
5555
listenerFunction.forEach(listener => listener(getConfigChangeEvent(changingConfig)));
56-
let options = optionObserver.Options();
56+
let options = optionProvider.GetLatestOptions();
5757
expect(options.disableCodeActions).to.be.equal(true);
5858
});
5959
});

0 commit comments

Comments
 (0)