maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

make vscode a dependency, don't use magic build, discover and fix some issues with the global vscode module

Browse source
This commit is contained in:
Johannes Rieken 2015-12-03 10:58:22 +01:00
parent 4b62802816
commit 38133dbe57
6 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
extensions/csharp-o/package.json
View file

@ -3,8 +3,7 @@
"version": "0.1.0",
"publisher": "vscode",
"engines": {
"node": "^4.0.0",
"vscode": "*"
"vscode": "^0.10.1"
},
"activationEvents": [
"onLanguage:csharp",
@ -18,10 +17,10 @@
],
"main": "./out/omnisharpMain",
"scripts": {
"postinstall": "node ./node_modules/gulp/bin/gulp.js omnisharp",
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../gulpfile.plugins.js compile-plugin:csharp-o ./tsconfig.json"
"postinstall": "node ./node_modules/gulp/bin/gulp.js omnisharp"
},
"dependencies": {
"vscode": "^0.10.1",
"run-in-terminal": "*",
"semver": "*"
},

4
extensions/csharp-o/src/features/diagnosticsProvider.ts
View file

@ -9,7 +9,7 @@ import {OmnisharpServer} from '../omnisharpServer';
import AbstractSupport from './abstractProvider';
import * as proto from '../protocol';
import {createRequest, toRange} from '../typeConvertion';
import {Disposable, Uri, CancellationTokenSource, TextDocument, TextDocumentChangeEvent, Range, Diagnostic, DiagnosticSeverity, Location, workspace, languages} from 'vscode';
import {Disposable, Uri, CancellationTokenSource, TextDocument, TextDocumentChangeEvent, Range, Diagnostic, DiagnosticCollection, DiagnosticSeverity, Location, workspace, languages} from 'vscode';
export class Advisor {
@ -88,7 +88,7 @@ class DiagnosticsProvider extends AbstractSupport {
private _disposable: Disposable;
private _documentValidations: { [uri: string]: CancellationTokenSource } = Object.create(null);
private _projectValidation: CancellationTokenSource;
private _diagnostics: vscode.DiagnosticCollection;
private _diagnostics: DiagnosticCollection;
constructor(server: OmnisharpServer, validationAdvisor: Advisor) {
super(server);

2
extensions/csharp-o/src/features/omnisharpStatus.ts
View file

@ -228,7 +228,7 @@ export function reportServerStatus(server: OmnisharpServer): vscode.Disposable{
}
// show user message
let _messageHandle: number;
let _messageHandle: NodeJS.Timer;
function showMessageSoon() {
clearTimeout(_messageHandle);
_messageHandle = setTimeout(function() {

4
extensions/csharp-o/src/omnisharpMain.ts
View file

@ -23,11 +23,11 @@ import {StdioOmnisharpServer} from './omnisharpServer';
import forwardChanges from './features/changeForwarding';
import reportStatus from './features/omnisharpStatus';
import findLaunchTargets from './launchTargetFinder';
import {Disposable, ExtensionContext, languages, extensions} from 'vscode';
import {Disposable, ExtensionContext, DocumentSelector, languages, extensions} from 'vscode';
export function activate(context: ExtensionContext): any {
const _selector: vscode.DocumentSelector = {
const _selector: DocumentSelector = {
language: 'csharp',
scheme: 'file' // only files from disk
};

2
extensions/csharp-o/src/omnisharpServer.ts
View file

@ -67,7 +67,7 @@ export abstract class OmnisharpServer {
return this._solutionPath;
}
public getChannel(): vscode.OutputChannel {
public getChannel(): OutputChannel {
return this._channel;
}

5
extensions/csharp-o/src/typings/ref.d.ts vendored
View file

@ -3,7 +3,4 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../extensions/declares.d.ts'/>
/// <reference path='../../../../extensions/node.d.ts'/>
/// <reference path='../../../../extensions/lib.core.d.ts'/>
/// <reference path='../../node_modules/vscode/typings/index.d.ts'/>