Skip to content

Improve OmniSharp options #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 24, 2016
Merged

Improve OmniSharp options #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b339bb
Improve OmniSharp options
DustinCampbell Aug 24, 2016
c3bff7e
Add configuration for new OmniSharp options in package.json
DustinCampbell Aug 24, 2016
187dfc7
Update text that reference old options
DustinCampbell Aug 24, 2016
1e2dc9f
tweak whitespace
DustinCampbell Aug 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,28 @@
"type": "boolean",
"default": false,
"description": "Suppress the warning that the .NET CLI is not on the path."
},
"omnisharp.path": {
"type": [
"string",
"null"
],
"default": null,
"description": "Specifies the full path to the OmniSharp server."
},
"omnisharp.useMono": {
"type": "boolean",
"default": false,
"description": "Launch OmniSharp with Mono."
},
"omnisharp.loggingLevel": {
"type": "string",
"default": "default",
"enum": [
"default",
"verbose"
],
"description": "Specifies the level of logging output from the OmniSharp server."
}
}
},
Expand Down
5 changes: 3 additions & 2 deletions src/omnisharp/omnisharp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ import * as fs from 'fs-extra-promise';
import * as path from 'path';

export interface Options {
path?: string;
usesMono?: boolean;
path?: string;
useMono?: boolean;
loggingLevel?: string;
}

export enum Flavor {
Expand Down
44 changes: 32 additions & 12 deletions src/omnisharp/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,26 @@ export abstract class OmnisharpServer {
}

private _readOptions(): omnisharp.Options {
const config = vscode.workspace.getConfiguration('csharp');
// Extra effort is taken below to ensure that legacy versions of options
// are supported below. In particular, these are:
//
// - "csharp.omnisharp" -> "omnisharp.path"
// - "csharp.omnisharpUsesMono" -> "omnisharp.useMono"

return {
path: config.get<string>('omnisharp'),
usesMono: config.get<boolean>('omnisharpUsesMono')
};
const omnisharpConfig = vscode.workspace.getConfiguration('omnisharp');
const csharpConfig = vscode.workspace.getConfiguration('csharp');

const path = omnisharpConfig.has('path')
? omnisharpConfig.get<string>('path')
: csharpConfig.get<string>('omnisharp');

const useMono = omnisharpConfig.has('useMono')
? omnisharpConfig.get<boolean>('useMono')
: csharpConfig.get<boolean>('omnisharpUsesMono');

const loggingLevel = omnisharpConfig.get<string>('loggingLevel');

return { path, useMono, loggingLevel };
}

private _recordRequestDelay(requestName: string, elapsedTime: number) {
Expand Down Expand Up @@ -237,7 +251,7 @@ export abstract class OmnisharpServer {
const options = this._readOptions();

let flavor: omnisharp.Flavor;
if (options.path !== undefined && options.usesMono === true) {
if (options.path !== undefined && options.useMono === true) {
flavor = omnisharp.Flavor.Mono;
}
else {
Expand All @@ -250,11 +264,17 @@ export abstract class OmnisharpServer {

const solutionPath = launchTarget.target;
const cwd = dirname(solutionPath);
const args = [
let args = [
'-s', solutionPath,
'--hostPID', process.pid.toString(),
'DotNet:enablePackageRestore=false'
].concat(this._extraArgs);
];

if (options.loggingLevel === 'verbose') {
args.push('-v');
}

args = args.concat(this._extraArgs);

this._fireEvent(Events.StdOut, `[INFO] Starting OmniSharp at '${solutionPath}'...\n`);
this._fireEvent(Events.BeforeServerStart, solutionPath);
Expand Down Expand Up @@ -391,7 +411,7 @@ export abstract class OmnisharpServer {
return omnisharp.findServerPath(options.path).then(serverPath => {
return resolve(serverPath);
}).catch(err => {
vscode.window.showWarningMessage(`Invalid "csharp.omnisharp" user setting specified ('${options.path}).`);
vscode.window.showWarningMessage(`Invalid value specified for "omnisharp.path" ('${options.path}).`);
return reject(err);
});
}
Expand All @@ -409,9 +429,9 @@ export abstract class OmnisharpServer {
this._channel.appendLine(" 1. If it's not already installed, download and install Mono (https://www.mono-project.com)");
this._channel.appendLine(" 2. Download and untar the latest OmniSharp Mono release from https://github.com/OmniSharp/omnisharp-roslyn/releases/");
this._channel.appendLine(" 3. In Visual Studio Code, select Preferences->User Settings to open settings.json.");
this._channel.appendLine(" 4. In settings.json, add a new setting: \"csharp.omnisharp\": \"/path/to/omnisharp/OmniSharp.exe\"");
this._channel.appendLine(" 4. In settings.json, add a new setting: \"csharp.omnisharpUsesMono\": true");
this._channel.appendLine(" 5. Restart Visual Studio Code.");
this._channel.appendLine(" 4. In settings.json, add a new setting: \"omnisharp.path\": \"/path/to/omnisharp/OmniSharp.exe\"");
this._channel.appendLine(" 5. In settings.json, add a new setting: \"omnisharp.useMono\": true");
this._channel.appendLine(" 6. Restart Visual Studio Code.");
this._channel.show();

throw err;
Expand Down