From 38133dbe57bdf0985ca09ad4e08b7ba312ea57ac Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Thu, 3 Dec 2015 10:58:22 +0100
Subject: [PATCH] make vscode a dependency, don't use magic build, discover and
 fix some issues with the global vscode module

---
 extensions/csharp-o/package.json                        | 7 +++----
 extensions/csharp-o/src/features/diagnosticsProvider.ts | 4 ++--
 extensions/csharp-o/src/features/omnisharpStatus.ts     | 2 +-
 extensions/csharp-o/src/omnisharpMain.ts                | 4 ++--
 extensions/csharp-o/src/omnisharpServer.ts              | 2 +-
 extensions/csharp-o/src/typings/ref.d.ts                | 5 +----
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/extensions/csharp-o/package.json b/extensions/csharp-o/package.json
index 5a8833524a9..732cdb1252b 100644
--- a/extensions/csharp-o/package.json
+++ b/extensions/csharp-o/package.json
@@ -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": "*"
   },
diff --git a/extensions/csharp-o/src/features/diagnosticsProvider.ts b/extensions/csharp-o/src/features/diagnosticsProvider.ts
index 96310e6ee3d..8360a36f72c 100644
--- a/extensions/csharp-o/src/features/diagnosticsProvider.ts
+++ b/extensions/csharp-o/src/features/diagnosticsProvider.ts
@@ -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);
diff --git a/extensions/csharp-o/src/features/omnisharpStatus.ts b/extensions/csharp-o/src/features/omnisharpStatus.ts
index 9cc121ce6a2..88390518120 100644
--- a/extensions/csharp-o/src/features/omnisharpStatus.ts
+++ b/extensions/csharp-o/src/features/omnisharpStatus.ts
@@ -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() {
diff --git a/extensions/csharp-o/src/omnisharpMain.ts b/extensions/csharp-o/src/omnisharpMain.ts
index d17e827d840..5c31ee507c8 100644
--- a/extensions/csharp-o/src/omnisharpMain.ts
+++ b/extensions/csharp-o/src/omnisharpMain.ts
@@ -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
 	};
diff --git a/extensions/csharp-o/src/omnisharpServer.ts b/extensions/csharp-o/src/omnisharpServer.ts
index 2979d5b50b1..5dbbe123bb0 100644
--- a/extensions/csharp-o/src/omnisharpServer.ts
+++ b/extensions/csharp-o/src/omnisharpServer.ts
@@ -67,7 +67,7 @@ export abstract class OmnisharpServer {
 		return this._solutionPath;
 	}
 
-	public getChannel(): vscode.OutputChannel {
+	public getChannel(): OutputChannel {
 		return this._channel;
 	}
 
diff --git a/extensions/csharp-o/src/typings/ref.d.ts b/extensions/csharp-o/src/typings/ref.d.ts
index 523ce020a74..07bc4a016a7 100644
--- a/extensions/csharp-o/src/typings/ref.d.ts
+++ b/extensions/csharp-o/src/typings/ref.d.ts
@@ -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'/>
\ No newline at end of file
+/// <reference path='../../node_modules/vscode/typings/index.d.ts'/>
\ No newline at end of file
-- 
GitLab