Merge pull request #2830 from akshita31/rxjs_update

akshita31 · web-flow · commit 656c182dcfe0 · 2019-01-31T16:12:51.000-08:00
Rxjs update to version 6
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "ms-vscode",
-  "version": "1.18.0-beta5",
+  "version": "1.18.0-beta6",
   "description": "C# for Visual Studio Code (powered by OmniSharp).",
   "displayName": "C#",
   "author": "Microsoft Corporation",
@@ -69,23 +69,23 @@
   },
   "dependencies": {
     "async-file": "2.0.2",
-    "fs-extra": "5.0.0",
+    "fs-extra": "7.0.1",
     "http-proxy-agent": "2.1.0",
     "https-proxy-agent": "2.2.1",
-    "jsonc-parser": "1.0.0",
+    "jsonc-parser": "2.0.2",
     "microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/386a5dff35391e14f14e5945e7903f63/microsoft.aspnetcore.razor.vscode-1.0.0-alpha2-20181112.3.tgz",
     "mkdirp": "0.5.1",
-    "node-filter-async": "0.0.4",
+    "node-filter-async": "1.1.1",
     "open": "*",
     "remove-bom-buffer": "3.0.0",
     "request-light": "0.2.4",
-    "rxjs": "5.5.6",
-    "semver": "*",
+    "rxjs": "6.4.0",
+    "semver": "5.6.0",
     "stream": "0.0.2",
     "strip-bom": "3.0.0",
     "tmp": "0.0.33",
-    "vscode-debugprotocol": "1.32.0",
-    "vscode-extension-telemetry": "0.1.0",
+    "vscode-debugprotocol": "1.33.0",
+    "vscode-extension-telemetry": "0.1.1",
     "yauzl": "2.10.0"
   },
   "devDependencies": {
@@ -144,7 +144,7 @@
     "typescript": "2.8.3",
     "unzip2": "0.2.5",
     "vsce": "1.55.0",
-    "vscode": "1.1.22"
+    "vscode": "1.1.28"
   },
   "runtimeDependencies": [
     {
diff --git a/src/CompositeDisposable.ts b/src/CompositeDisposable.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information. 
  *--------------------------------------------------------------------------------------------*/
 
-import { Subscription } from "rxjs/Subscription";
+import { Subscription } from "rxjs";
 import Disposable, { IDisposable } from "./Disposable";
 
 export default class CompositeDisposable extends Disposable {
diff --git a/src/Disposable.ts b/src/Disposable.ts
@@ -2,7 +2,7 @@
  *  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 { Subscription } from "rxjs"; 
 
 export default class Disposable implements IDisposable {
     private onDispose: { (): void };
diff --git a/src/EventStream.ts b/src/EventStream.ts
@@ -2,9 +2,8 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { Subject } from "rxjs/Subject";
+import { Subject ,  Subscription } from "rxjs";
 import { BaseEvent } from "./omnisharp/loggingEvents";
-import { Subscription } from "rxjs/Subscription";
 
 export class EventStream {
     private sink: Subject<BaseEvent>;
diff --git a/src/features/json/jsonContributions.ts b/src/features/json/jsonContributions.ts
@@ -130,7 +130,7 @@ export class JSONCompletionItemProvider implements CompletionItemProvider {
         let collectPromise: Thenable<void> = null;
 
         if (location.isAtPropertyKey) {
-            let addValue = !location.previousNode || !location.previousNode.columnOffset && (offset == (location.previousNode.offset + location.previousNode.length));
+            let addValue = !location.previousNode || !location.previousNode.colonOffset && (offset == (location.previousNode.offset + location.previousNode.length));
             let scanner = createScanner(document.getText(), true);
             scanner.setPosition(offset);
             scanner.scan();
diff --git a/src/observables/CreateOptionStream.ts b/src/observables/CreateOptionStream.ts
@@ -5,10 +5,8 @@
 
 import { Options } from "../omnisharp/options";
 import { vscode } from "../vscodeAdapter";
-import 'rxjs/add/operator/take';
-import 'rxjs/add/operator/publishBehavior';
-import { Observable } from "rxjs/Observable";
-import { Observer } from "rxjs/Observer";
+import { Observable, Observer } from "rxjs";
+import { publishBehavior } from "rxjs/operators";
 
 export default function createOptionStream(vscode: vscode): Observable<Options> {
     return Observable.create((observer: Observer<Options>) => {
@@ -20,5 +18,5 @@ export default function createOptionStream(vscode: vscode): Observable<Options>
         });
 
         return () => disposable.dispose();
-    }).publishBehavior(Options.Read(vscode)).refCount();
+    }).pipe(publishBehavior(Options.Read(vscode))).refCount();
 }
diff --git a/src/observers/OptionChangeObserver.ts b/src/observers/OptionChangeObserver.ts
@@ -1,23 +1,22 @@
 /*--------------------------------------------------------------------------------------------- 
- *  Copyright (c) Microsoft Corporation. All rights reserved. 
- *  Licensed under the MIT License. See License.txt in the project root for license information. 
- *--------------------------------------------------------------------------------------------*/
+*  Copyright (c) Microsoft Corporation. All rights reserved. 
+*  Licensed under the MIT License. See License.txt in the project root for license information. 
+*--------------------------------------------------------------------------------------------*/
 
 import { vscode } from "../vscodeAdapter";
 import { Options } from "../omnisharp/options";
 import ShowInformationMessage from "./utils/ShowInformationMessage";
-import { Observable } from "rxjs/Observable";
+import { Observable } from "rxjs";
 import Disposable from "../Disposable";
-import 'rxjs/add/operator/filter';
-import 'rxjs/add/operator/distinctUntilChanged';
+import { filter} from 'rxjs/operators';
 
 function ConfigChangeObservable(optionObservable: Observable<Options>): Observable<Options> {
     let options: Options;
-    return optionObservable. filter(newOptions => {
+    return optionObservable.pipe( filter(newOptions => {
         let changed = (options && hasChanged(options, newOptions));
         options = newOptions;
         return changed;
-    });
+    }));
 }
 
 export function ShowOmniSharpConfigChangePrompt(optionObservable: Observable<Options>, vscode: vscode): Disposable {
diff --git a/src/observers/OptionProvider.ts b/src/observers/OptionProvider.ts
@@ -4,9 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Options } from "../omnisharp/options";
-import { Subscription } from "rxjs/Subscription";
-import { Observable } from "rxjs/Observable";
-
+import { Subscription ,  Observable } from "rxjs";
 export default class OptionProvider {
     private options: Options;
     private subscription: Subscription;
diff --git a/src/observers/WarningMessageObserver.ts b/src/observers/WarningMessageObserver.ts
@@ -1,21 +1,21 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
 
+import {debounceTime} from 'rxjs/operators';
 import { vscode } from '../vscodeAdapter';
 import { BaseEvent, OmnisharpServerOnError, OmnisharpServerMsBuildProjectDiagnostics } from "../omnisharp/loggingEvents";
-import { Scheduler } from 'rxjs/Scheduler';
-import { Subject } from 'rxjs/Subject';
-import 'rxjs/add/operator/debounceTime';
+import { Scheduler ,  Subject } from 'rxjs';
+
 import showWarningMessage from './utils/ShowWarningMessage';
 
 export class WarningMessageObserver {
     private warningMessageDebouncer: Subject<BaseEvent>;
 
     constructor(private vscode: vscode, private disableMsBuildDiagnosticWarning: () => boolean, scheduler?: Scheduler) {
         this.warningMessageDebouncer = new Subject<BaseEvent>();
-        this.warningMessageDebouncer.debounceTime(1500, scheduler).subscribe(async event => {
+        this.warningMessageDebouncer.pipe(debounceTime(1500, scheduler)).subscribe(async event => {
             let message = "Some projects have trouble loading. Please review the output for more details.";
             await showWarningMessage(this.vscode, message, { title: "Show Output", command: 'o.showOutput' });
         });
diff --git a/src/omnisharp/server.ts b/src/omnisharp/server.ts
@@ -1,7 +1,8 @@
+
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'fs';
 import * as path from 'path';
@@ -24,8 +25,8 @@ import { OmnisharpDownloader } from './OmnisharpDownloader';
 import * as ObservableEvents from './loggingEvents';
 import { EventStream } from '../EventStream';
 import { NetworkSettingsProvider } from '../NetworkSettings';
-import { Subject } from 'rxjs/Subject';
-import 'rxjs/add/operator/debounceTime';
+import { Subject } from 'rxjs';
+import {debounceTime} from 'rxjs/operators';
 import CompositeDisposable from '../CompositeDisposable';
 import Disposable from '../Disposable';
 import OptionProvider from '../observers/OptionProvider';
@@ -97,7 +98,7 @@ export class OmniSharpServer {
         this._requestQueue = new RequestQueueCollection(this.eventStream, 8, request => this._makeRequest(request));
         let downloader = new OmnisharpDownloader(networkSettingsProvider, this.eventStream, this.packageJSON, platformInfo, extensionPath);
         this._omnisharpManager = new OmnisharpManager(downloader, platformInfo);
-        this.updateProjectDebouncer.debounceTime(1500).subscribe((event) => { this.updateProjectInfo(); });
+        this.updateProjectDebouncer.pipe(debounceTime(1500)).subscribe((event) => { this.updateProjectInfo(); });
         this.firstUpdateProject = true;
     }
 
diff --git a/test/unitTests/OptionObserver/OptionChangeObserver.test.ts b/test/unitTests/OptionObserver/OptionChangeObserver.test.ts
@@ -1,18 +1,15 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
 
 import { use as chaiUse, expect, should } from 'chai';
 import { updateConfig, getVSCodeWithConfig } from '../testAssets/Fakes';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/timeout';
+import { timeout } from 'rxjs/operators';
+import { from as observableFrom, Subject, BehaviorSubject } from 'rxjs';
 import { vscode } from '../../../src/vscodeAdapter';
 import { ShowOmniSharpConfigChangePrompt } from '../../../src/observers/OptionChangeObserver';
-import { Subject } from 'rxjs/Subject';
 import { Options } from '../../../src/omnisharp/options';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 
 chaiUse(require('chai-as-promised'));
 chaiUse(require('chai-string'));
@@ -37,7 +34,7 @@ suite("OmniSharpConfigChangeObserver", () => {
             signalCommandDone = () => { resolve(); };
         });
     });
-    
+
     [
         { config: "omnisharp", section: "path", value: "somePath" },
         { config: "omnisharp", section: "waitForDebugger", value: true },
@@ -59,7 +56,7 @@ suite("OmniSharpConfigChangeObserver", () => {
 
             test('Given an information message if the user clicks cancel, the command is not executed', async () => {
                 doClickCancel();
-                await expect(Observable.fromPromise(commandDone).timeout(1).toPromise()).to.be.rejected;
+                await expect(observableFrom(commandDone).pipe(timeout(1)).toPromise()).to.be.rejected;
                 expect(invokedCommand).to.be.undefined;
             });
 
@@ -69,9 +66,9 @@ suite("OmniSharpConfigChangeObserver", () => {
                 expect(invokedCommand).to.be.equal("o.restart");
             });
         });
-        });
-    
-    suite('Information Message is not shown on change in',() => {
+    });
+
+    suite('Information Message is not shown on change in', () => {
         [
             { config: "csharp", section: 'disableCodeActions', value: true },
             { config: "csharp", section: 'testsCodeLens.enabled', value: false },
diff --git a/test/unitTests/OptionObserver/OptionProvider.test.ts b/test/unitTests/OptionObserver/OptionProvider.test.ts
@@ -7,7 +7,7 @@ import { should, expect } from 'chai';
 import { getVSCodeWithConfig, updateConfig } from "../testAssets/Fakes";
 import { vscode } from "../../../src/vscodeAdapter";
 import OptionProvider from '../../../src/observers/OptionProvider';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 import { Options } from '../../../src/omnisharp/options';
 
 suite('OptionProvider', () => {
diff --git a/test/unitTests/logging/ErrorMessageObserver.test.ts b/test/unitTests/logging/ErrorMessageObserver.test.ts
@@ -6,8 +6,8 @@
 import { use as chaiUse, expect, should } from 'chai';
 import { vscode } from '../../../src/vscodeAdapter';
 import { getFakeVsCode } from '../testAssets/Fakes';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/timeout';
+
+
 import { ErrorMessageObserver } from '../../../src/observers/ErrorMessageObserver';
 import { ZipError, DotNetTestRunFailure, DotNetTestDebugStartFailure, EventWithMessage, IntegrityCheckFailure } from '../../../src/omnisharp/loggingEvents';
 
diff --git a/test/unitTests/logging/InformationMessageObserver.test.ts b/test/unitTests/logging/InformationMessageObserver.test.ts
@@ -1,14 +1,13 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
 
 import { InformationMessageObserver } from '../../../src/observers/InformationMessageObserver';
 import { use as chaiUse, expect, should } from 'chai';
 import { getUnresolvedDependenices, updateConfig, getVSCodeWithConfig } from '../testAssets/Fakes';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/operator/timeout';
+import {from as observableFrom } from 'rxjs';
+import {timeout} from 'rxjs/operators';
 
 chaiUse(require('chai-as-promised'));
 chaiUse(require('chai-string'));
@@ -72,7 +71,7 @@ suite("InformationMessageObserver", () => {
                 test('Given an information message if the user clicks cancel, the command is not executed', async () => {
                     observer.post(elem.event);
                     doClickCancel();
-                    await expect(Observable.fromPromise(commandDone).timeout(1).toPromise()).to.be.rejected;
+                    await expect(observableFrom(commandDone).pipe(timeout(1)).toPromise()).to.be.rejected;
                     expect(invokedCommand).to.be.undefined;
                 });
             });
diff --git a/test/unitTests/logging/WarningMessageObserver.test.ts b/test/unitTests/logging/WarningMessageObserver.test.ts
@@ -1,20 +1,15 @@
 /*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
+*  Copyright (c) Microsoft Corporation. All rights reserved.
+*  Licensed under the MIT License. See License.txt in the project root for license information.
+*--------------------------------------------------------------------------------------------*/
 
 import { WarningMessageObserver } from '../../../src/observers/WarningMessageObserver';
 import { assert, use as chaiUse, expect, should } from 'chai';
 import { getFakeVsCode, getMSBuildDiagnosticsMessage, getOmnisharpMSBuildProjectDiagnosticsEvent, getOmnisharpServerOnErrorEvent } from '../testAssets/Fakes';
 import { vscode } from '../../../src/vscodeAdapter';
-import { TestScheduler } from 'rxjs/testing/TestScheduler';
-import { Observable } from 'rxjs/Observable';
-import "rxjs/add/operator/map";
-import "rxjs/add/operator/debounceTime";
-import 'rxjs/add/operator/timeout';
-import 'rxjs/add/observable/fromPromise';
-import 'rxjs/add/observable/timer';
-import { Subject } from 'rxjs/Subject';
+import { TestScheduler } from 'rxjs/testing';
+import { from as observableFrom, Subject } from 'rxjs';
+import { timeout, map } from 'rxjs/operators';
 
 chaiUse(require('chai-as-promised'));
 chaiUse(require('chai-string'));
@@ -165,7 +160,7 @@ suite('WarningMessageObserver', () => {
             test(`Given a warning message, when the user clicks ok the command is executed`, async () => {
                 let marble = `${timeToMarble(1500)}a`;
                 let eventList = scheduler.createHotObservable(marble, { a: elem.eventA });
-                scheduler.expectObservable(eventList.map(e => observer.post(e)));
+                scheduler.expectObservable(eventList.pipe(map(e => observer.post(e))));
                 scheduler.flush();
                 doClickOk();
                 await commandDone;
@@ -175,10 +170,10 @@ suite('WarningMessageObserver', () => {
             test(`Given a warning message, when the user clicks cancel the command is not executed`, async () => {
                 let marble = `${timeToMarble(1500)}a--|`;
                 let eventList = scheduler.createHotObservable(marble, { a: elem.eventA });
-                scheduler.expectObservable(eventList.map(e => observer.post(e)));
+                scheduler.expectObservable(eventList.pipe(map(e => observer.post(e))));
                 scheduler.flush();
                 doClickCancel();
-                await expect(Observable.fromPromise(commandDone).timeout(1).toPromise()).to.be.rejected;
+                await expect(observableFrom(commandDone).pipe(timeout(1)).toPromise()).to.be.rejected;
                 expect(invokedCommand).to.be.undefined;
             });
         });
diff --git a/test/unitTests/optionStream.test.ts b/test/unitTests/optionStream.test.ts
@@ -7,10 +7,9 @@ import { should, expect } from 'chai';
 import { ConfigurationChangeEvent, vscode } from "../../src/vscodeAdapter";
 import { getVSCodeWithConfig, updateConfig } from "./testAssets/Fakes";
 import Disposable from "../../src/Disposable";
-import { Observable } from "rxjs/Observable";
+import { Observable, Subscription } from "rxjs";
 import { Options } from "../../src/omnisharp/options";
 import { GetConfigChangeEvent } from './testAssets/GetConfigChangeEvent';
-import { Subscription } from 'rxjs/Subscription';
 import createOptionStream from '../../src/observables/CreateOptionStream';
 
 suite('OptionStream', () => {
diff --git a/tslint.json b/tslint.json
@@ -9,7 +9,7 @@
         "curly": true,
         "semicolon": true,
         "indent": [true, "spaces", 4],
-        "file-header": [true, ".*"]
+        "file-header": [true, ".*"],
     },
     "rulesDirectory": [
       "tslint-microsoft-contrib",
