Merge pull request #2243 from akshita31/update_offline_packaging

Update offline packaging for release

Author: akshita31

package.json

@@ -24,6 +24,9 @@
   "keywords": [
     "multi-root ready"
   ],
+  "defaults":{
+    "omniSharp" : "1.30.0"
+  },
   "main": "./out/src/main",
   "scripts": {
     "vscode:prepublish": "tsc -p ./",
@@ -143,7 +146,7 @@
       "description": "OmniSharp for Windows (.NET 4.6 / x86)",
       "url": "https://download.visualstudio.microsoft.com/download/pr/12168336/be303385c06ad88bc3e33fa38cc09760/omnisharp-win-x86-1.30.0.zip",
       "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.30.0.zip",
-      "installPath": ".omnisharp",
+      "installPath": ".omnisharp/1.30.0",
       "platforms": [
         "win32"
       ],
@@ -157,7 +160,7 @@
       "description": "OmniSharp for Windows (.NET 4.6 / x64)",
       "url": "https://download.visualstudio.microsoft.com/download/pr/12168337/159fcd61baf209a6b10d371fa5b2817d/omnisharp-win-x64-1.30.0.zip",
       "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.30.0.zip",
-      "installPath": ".omnisharp",
+      "installPath": ".omnisharp/1.30.0",
       "platforms": [
         "win32"
       ],
@@ -171,7 +174,7 @@
       "description": "OmniSharp for OSX",
       "url": "https://download.visualstudio.microsoft.com/download/pr/12168334/94b1fbb0c67cb3320c8eaaa75fa49c5d/omnisharp-osx-1.30.0.zip",
       "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-osx-1.30.0.zip",
-      "installPath": ".omnisharp",
+      "installPath": ".omnisharp/1.30.0",
       "platforms": [
         "darwin"
       ],
@@ -186,7 +189,7 @@
       "description": "OmniSharp for Linux (x86)",
       "url": "https://download.visualstudio.microsoft.com/download/pr/12168335/c8f77432262698d7012ce1105588f974/omnisharp-linux-x86-1.30.0.zip",
       "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x86-1.30.0.zip",
-      "installPath": ".omnisharp",
+      "installPath": ".omnisharp/1.30.0",
       "platforms": [
         "linux"
       ],
@@ -205,7 +208,7 @@
       "description": "OmniSharp for Linux (x64)",
       "url": "https://download.visualstudio.microsoft.com/download/pr/12168333/63644667dd9c8a6320d3aef3ac2fb901/omnisharp-linux-x64-1.30.0.zip",
       "fallbackUrl": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-linux-x64-1.30.0.zip",
-      "installPath": ".omnisharp",
+      "installPath": ".omnisharp/1.30.0",
       "platforms": [
         "linux"
       ],

src/CompositeDisposable.ts

@@ -1,37 +1,32 @@
 /*--------------------------------------------------------------------------------------------- 
  *  Copyright (c) Microsoft Corporation. All rights reserved. 
  *  Licensed under the MIT License. See License.txt in the project root for license information. 
- *--------------------------------------------------------------------------------------------*/ 
- 
-import { Subscription } from "rxjs/Subscription"; 
-import Disposable from "./Disposable"; 
- 
-export default class CompositeDisposable extends Disposable { 
-    private disposables = new Subscription(); 
- 
-    constructor (...disposables: Disposable[]){ 
-        super(() => this.disposables.unsubscribe()); 
- 
-        for (const disposable of disposables) { 
-            if (disposable) { 
-                this.disposables.add(disposable.dispose); 
-            } 
-            else { 
-                throw new Error("null disposables are not supported"); 
-            } 
-        } 
-    } 
- 
-    public add(disposable: Disposable | {(): void}) { 
-        if (!disposable) { 
-            throw new Error("disposable cannot be null"); 
-        } 
- 
-        const actualDisposable =  
-            disposable.constructor.name === Disposable.name 
-                ? <Disposable>disposable 
-                : new Disposable(<{(): void}>disposable); 
-         
-        this.disposables.add(actualDisposable.dispose); 
-    } 
+ *--------------------------------------------------------------------------------------------*/
+
+import { Subscription } from "rxjs/Subscription";
+import Disposable, { IDisposable } from "./Disposable";
+
+export default class CompositeDisposable extends Disposable {
+    private disposables = new Subscription();
+
+    constructor(...disposables: IDisposable[]) {
+        super(() => this.disposables.unsubscribe());
+
+        for (const disposable of disposables) {
+            if (disposable) {
+                this.add(disposable);
+            }
+            else {
+                throw new Error("null disposables are not supported");
+            }
+        }
+    }
+
+    public add(disposable: IDisposable) {
+        if (!disposable) {
+            throw new Error("disposable cannot be null");
+        }
+
+        this.disposables.add(() => disposable.dispose());
+    }
 }

src/Disposable.ts

@@ -2,19 +2,29 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved. 
  *  Licensed under the MIT License. See License.txt in the project root for license information. 
  *--------------------------------------------------------------------------------------------*/
+import { Subscription } from "rxjs/Subscription"; 
 
-export default class Disposable {
+export default class Disposable implements IDisposable {
     private onDispose: { (): void };
 
-    constructor(onDispose: { (): void }) {
+    constructor(onDispose: { (): void } | Subscription) {
         if (!onDispose) {
             throw new Error("onDispose cannot be null or empty.");
         }
-
-        this.onDispose = onDispose;
+        
+        if (onDispose instanceof Subscription) {
+            this.onDispose = () => onDispose.unsubscribe();
+        }
+        else {
+            this.onDispose = onDispose;
+        }
     }
 
     public dispose = (): void => {
         this.onDispose();
     }
 }
+
+export interface IDisposable {
+    dispose: () => void;
+}

src/features/abstractProvider.ts

@@ -3,26 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable } from 'vscode';
 import { OmniSharpServer } from '../omnisharp/server';
+import CompositeDisposable from '../CompositeDisposable';
 
 export default abstract class AbstractProvider {
 
     protected _server: OmniSharpServer;
-    private _disposables: Disposable[];
+    private _disposables: CompositeDisposable;
 
     constructor(server: OmniSharpServer) {
         this._server = server;
-        this._disposables = [];
+        this._disposables = new CompositeDisposable();
     }
 
-    protected addDisposables(...disposables: Disposable[]) {
-        this._disposables.push(...disposables);
+    protected addDisposables(disposables: CompositeDisposable) {
+        this._disposables.add(disposables);
     }
 
-    dispose() {
-        while (this._disposables.length) {
-            this._disposables.pop().dispose();
-        }
+    dispose = () => {
+        this._disposables.dispose();
     }
 }

src/features/changeForwarding.ts

@@ -3,12 +3,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import {Disposable, Uri, workspace} from 'vscode';
+import {Uri, workspace} from 'vscode';
 import {OmniSharpServer} from '../omnisharp/server';
 import * as serverUtils from '../omnisharp/utils';
 import { FileChangeType } from '../omnisharp/protocol';
+import { IDisposable } from '../Disposable';
+import CompositeDisposable from '../CompositeDisposable';
 
-function forwardDocumentChanges(server: OmniSharpServer): Disposable {
+function forwardDocumentChanges(server: OmniSharpServer): IDisposable {
 
     return workspace.onDidChangeTextDocument(event => {
 
@@ -28,7 +30,7 @@ function forwardDocumentChanges(server: OmniSharpServer): Disposable {
     });
 }
 
-function forwardFileChanges(server: OmniSharpServer): Disposable {
+function forwardFileChanges(server: OmniSharpServer): IDisposable {
 
     function onFileSystemEvent(changeType: FileChangeType): (uri: Uri) => void {
         return function(uri: Uri) 
@@ -51,13 +53,13 @@ function forwardFileChanges(server: OmniSharpServer): Disposable {
     let d2 = watcher.onDidDelete(onFileSystemEvent(FileChangeType.Delete));
     let d3 = watcher.onDidChange(onFileSystemEvent(FileChangeType.Change));
 
-    return Disposable.from(watcher, d1, d2, d3);
+    return new CompositeDisposable(watcher, d1, d2, d3);
 }
 
-export default function forwardChanges(server: OmniSharpServer): Disposable {
+export default function forwardChanges(server: OmniSharpServer): IDisposable {
 
     // combine file watching and text document watching
-    return Disposable.from(
+    return new CompositeDisposable(
         forwardDocumentChanges(server),
         forwardFileChanges(server));
 }

src/features/codeActionProvider.ts

@@ -12,6 +12,7 @@ import * as serverUtils from '../omnisharp/utils';
 import { Options } from '../omnisharp/options';
 import { FileModificationType } from '../omnisharp/protocol';
 import { Uri } from 'vscode';
+import CompositeDisposable from '../CompositeDisposable';
 
 export default class CodeActionProvider extends AbstractProvider implements vscode.CodeActionProvider {
 
@@ -27,7 +28,7 @@ export default class CodeActionProvider extends AbstractProvider implements vsco
 
         let d1 = vscode.workspace.onDidChangeConfiguration(this._resetCachedOptions, this);
         let d2 = vscode.commands.registerCommand(this._commandId, this._runCodeAction, this);
-        this.addDisposables(d1, d2);
+        this.addDisposables(new CompositeDisposable(d1, d2));
     }
 
     private _resetCachedOptions(): void {

src/features/codeLensProvider.ts

@@ -13,6 +13,7 @@ import AbstractProvider from './abstractProvider';
 import { OmniSharpServer } from '../omnisharp/server';
 import { Options } from '../omnisharp/options';
 import TestManager from './dotnetTest';
+import CompositeDisposable from '../CompositeDisposable';
 
 class OmniSharpCodeLens extends vscode.CodeLens {
 
@@ -34,7 +35,7 @@ export default class OmniSharpCodeLensProvider extends AbstractProvider implemen
         this._resetCachedOptions();
 
         let configChangedDisposable = vscode.workspace.onDidChangeConfiguration(this._resetCachedOptions, this);
-        this.addDisposables(configChangedDisposable);
+        this.addDisposables(new CompositeDisposable(configChangedDisposable));
     }
 
     private _resetCachedOptions(): void {

src/features/commands.ts

@@ -17,8 +17,9 @@ import { getAdapterExecutionCommand } from '../coreclr-debug/activate';
 import { CommandShowOutput, CommandDotNetRestoreStart, CommandDotNetRestoreProgress, CommandDotNetRestoreSucceeded, CommandDotNetRestoreFailed } from '../omnisharp/loggingEvents';
 import { EventStream } from '../EventStream';
 import { PlatformInformation } from '../platform';
+import CompositeDisposable from '../CompositeDisposable';
 
-export default function registerCommands(server: OmniSharpServer, eventStream: EventStream, platformInfo: PlatformInformation) {
+export default function registerCommands(server: OmniSharpServer, eventStream: EventStream, platformInfo: PlatformInformation): CompositeDisposable {
     let d1 = vscode.commands.registerCommand('o.restart', () => restartOmniSharp(server));
     let d2 = vscode.commands.registerCommand('o.pickProjectAndStart', () => pickProjectAndStart(server));
     let d3 = vscode.commands.registerCommand('o.showOutput', () => eventStream.post(new CommandShowOutput()));
@@ -50,7 +51,7 @@ export default function registerCommands(server: OmniSharpServer, eventStream: E
     let d9 = vscode.commands.registerCommand('csharp.coreclrAdapterExecutableCommand', async (args) => getAdapterExecutionCommand(platformInfo, eventStream));
     let d10 = vscode.commands.registerCommand('csharp.clrAdapterExecutableCommand', async (args) => getAdapterExecutionCommand(platformInfo, eventStream));
 
-    return vscode.Disposable.from(d1, d2, d3, d4, d5, d6, d7, d8, d9, d10);
+    return new CompositeDisposable(d1, d2, d3, d4, d5, d6, d7, d8, d9, d10);
 }
 
 function restartOmniSharp(server: OmniSharpServer) {

src/features/definitionMetadataDocumentProvider.ts

@@ -3,15 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Disposable, TextDocument, TextDocumentContentProvider, Uri, workspace } from 'vscode';
-
+import { TextDocument, TextDocumentContentProvider, Uri, workspace } from 'vscode';
 import { MetadataResponse } from '../omnisharp/protocol';
+import { IDisposable } from '../Disposable';
 
-export default class DefinitionMetadataDocumentProvider implements TextDocumentContentProvider, Disposable {
+export default class DefinitionMetadataDocumentProvider implements TextDocumentContentProvider, IDisposable {
     readonly scheme = "omnisharp-metadata";
-    private _registration : Disposable;
+    private _registration : IDisposable;
     private _documents: Map<string, MetadataResponse>;
-    private _documentClosedSubscription: Disposable;
+    private _documentClosedSubscription: IDisposable;
 
     constructor() {
         this._documents = new Map<string, MetadataResponse>();

src/features/diagnosticsProvider.ts

@@ -9,10 +9,12 @@ import * as protocol from '../omnisharp/protocol';
 import * as serverUtils from '../omnisharp/utils';
 import { toRange } from '../omnisharp/typeConvertion';
 import * as vscode from 'vscode';
+import CompositeDisposable from '../CompositeDisposable';
+import { IDisposable } from '../Disposable';
 
 export class Advisor {
 
-    private _disposable: vscode.Disposable;
+    private _disposable: CompositeDisposable;
     private _server: OmniSharpServer;
     private _packageRestoreCounter: number = 0;
     private _projectSourceFileCounts: { [path: string]: number } = Object.create(null);
@@ -25,7 +27,7 @@ export class Advisor {
         let d3 = server.onProjectRemoved(this._onProjectRemoved, this);
         let d4 = server.onBeforePackageRestore(this._onBeforePackageRestore, this);
         let d5 = server.onPackageRestore(this._onPackageRestore, this);
-        this._disposable = vscode.Disposable.from(d1, d2, d3, d4, d5);
+        this._disposable = new CompositeDisposable(d1, d2, d3, d4, d5);
     }
 
     public dispose() {
@@ -108,14 +110,14 @@ export class Advisor {
     }
 }
 
-export default function reportDiagnostics(server: OmniSharpServer, advisor: Advisor): vscode.Disposable {
+export default function reportDiagnostics(server: OmniSharpServer, advisor: Advisor): IDisposable {
     return new DiagnosticsProvider(server, advisor);
 }
 
 class DiagnosticsProvider extends AbstractSupport {
 
     private _validationAdvisor: Advisor;
-    private _disposable: vscode.Disposable;
+    private _disposable: CompositeDisposable;
     private _documentValidations: { [uri: string]: vscode.CancellationTokenSource } = Object.create(null);
     private _projectValidation: vscode.CancellationTokenSource;
     private _diagnostics: vscode.DiagnosticCollection;
@@ -131,7 +133,7 @@ class DiagnosticsProvider extends AbstractSupport {
         let d4 = vscode.workspace.onDidOpenTextDocument(event => this._onDocumentAddOrChange(event), this);
         let d3 = vscode.workspace.onDidChangeTextDocument(event => this._onDocumentAddOrChange(event.document), this);
         let d5 = vscode.workspace.onDidCloseTextDocument(this._onDocumentRemove, this);
-        this._disposable = vscode.Disposable.from(this._diagnostics, d1, d2, d3, d4, d5);
+        this._disposable = new CompositeDisposable(this._diagnostics, d1, d2, d3, d4, d5);
 
         // Go ahead and check for diagnostics in the currently visible editors.
         for (let editor of vscode.window.visibleTextEditors) {
@@ -142,7 +144,7 @@ class DiagnosticsProvider extends AbstractSupport {
         }
     }
 
-    public dispose(): void {
+    public dispose = () => {
         if (this._projectValidation) {
             this._projectValidation.dispose();
         }