fix conflict

Author: akshita31

src/observers/CsharpChannelObserver.ts

@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { BaseChannelObserver } from "./BaseChannelObserver";
-import { BaseEvent, InstallationFailure, DebuggerNotInstalledFailure, DebuggerPrerequisiteFailure, ProjectJsonDeprecatedWarning, DownloadStart } from "../omnisharp/loggingEvents";
+import { BaseEvent, InstallationFailure, DebuggerNotInstalledFailure, DebuggerPrerequisiteFailure, ProjectJsonDeprecatedWarning, PackageInstallStart } from "../omnisharp/loggingEvents";
 
 export class CsharpChannelObserver extends BaseChannelObserver {
     public post = (event: BaseEvent) => {
         switch (event.constructor.name) {
-            case DownloadStart.name:
+            case PackageInstallStart.name:
             case InstallationFailure.name:
             case DebuggerNotInstalledFailure.name:
             case DebuggerPrerequisiteFailure.name:

src/omnisharp/loggingEvents.ts

@@ -34,6 +34,10 @@ export class OmnisharpLaunch implements BaseEvent {
     constructor(public monoVersion: string, public monoPath: string, public command: string, public pid: number) { }
 }
 
+export class PackageInstallStart implements BaseEvent {
+    constructor() { }
+}
+
 export class PackageInstallation implements BaseEvent {
     constructor(public packageInfo: string) { }
 }

src/packageManager/PackageManager.ts

@@ -16,12 +16,14 @@ import { AbsolutePathPackage } from "./AbsolutePathPackage";
 import { touchInstallFile, InstallFileType, deleteInstallFile, installFileExists } from "../common";
 import { InstallationFailure } from "../omnisharp/loggingEvents";
 import { mkdirpSync } from "fs-extra";
+import { PackageInstallStart } from "../omnisharp/loggingEvents";
 
 export async function DownloadAndInstallPackages(packages: Package[], provider: NetworkSettingsProvider, platformInfo: PlatformInformation, eventStream: EventStream, extensionPath: string): Promise<void> {
     let absolutePathPackages = packages.map(pkg => AbsolutePathPackage.getAbsolutePathPackage(pkg, extensionPath));
     let filteredPackages = await filterPackages(absolutePathPackages, platformInfo);
 
     if (filteredPackages) {
+        eventStream.post(new PackageInstallStart());
         for (let pkg of filteredPackages) {
             let installationStage = "touchBeginFile";
             try {

test/unitTests/OmnisharpDownloader.test.ts

@@ -14,7 +14,7 @@ import MockHttpsServer from "./testAssets/MockHttpsServer";
 import {expect} from 'chai';
 import TestZip from "./testAssets/TestZip";
 import { createTestFile } from "./testAssets/TestFile";
-import { PackageInstallation, LogPlatformInfo, DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, InstallationSuccess } from "../../src/omnisharp/loggingEvents";
+import { PackageInstallation, LogPlatformInfo, DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, InstallationSuccess, PackageInstallStart } from "../../src/omnisharp/loggingEvents";
 import TestEventBus from "./testAssets/TestEventBus";
 import { testPackageJSON } from "./testAssets/testAssets";
 
@@ -62,6 +62,7 @@ suite('OmnisharpDownloader', () => {
         let expectedSequence = [ 
             new PackageInstallation('OmniSharp Version = 1.2.3'), 
             new LogPlatformInfo(new PlatformInformation("win32", "x86")), 
+            new PackageInstallStart(),
             new DownloadStart('OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'), 
             new DownloadSizeObtained(testZip.size), 
             new DownloadProgress(100, 'OmniSharp for Windows (.NET 4.6 / x86), Version = 1.2.3'), 

test/unitTests/Packages/PackageManager.test.ts

@@ -13,7 +13,7 @@ import { DownloadAndInstallPackages } from '../../../src/packageManager/PackageM
 import NetworkSettings from '../../../src/NetworkSettings';
 import { PlatformInformation } from '../../../src/platform';
 import { EventStream } from '../../../src/EventStream';
-import { DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart } from '../../../src/omnisharp/loggingEvents';
+import { DownloadStart, DownloadSizeObtained, DownloadProgress, DownloadSuccess, InstallationStart, PackageInstallStart } from '../../../src/omnisharp/loggingEvents';
 import MockHttpsServer from '../testAssets/MockHttpsServer';
 import { createTestFile } from '../testAssets/TestFile';
 import TestEventBus from '../testAssets/TestEventBus';
@@ -70,6 +70,7 @@ suite("Package Manager", () => {
 
     test("Events are created in the correct order", async () => {
         let eventsSequence = [
+            new PackageInstallStart(),
             new DownloadStart(packageDescription),
             new DownloadSizeObtained(testZip.size),
             new DownloadProgress(100, packageDescription),

test/unitTests/logging/CsharpChannelObserver.test.ts

@@ -6,13 +6,13 @@
 import { should, expect } from 'chai';
 import { getNullChannel } from '../testAssets/Fakes';
 import { CsharpChannelObserver } from '../../../src/observers/CsharpChannelObserver';
-import { InstallationFailure, DebuggerNotInstalledFailure, DebuggerPrerequisiteFailure, ProjectJsonDeprecatedWarning, BaseEvent, DownloadStart } from '../../../src/omnisharp/loggingEvents';
+import { InstallationFailure, DebuggerNotInstalledFailure, DebuggerPrerequisiteFailure, ProjectJsonDeprecatedWarning, BaseEvent, PackageInstallStart } from '../../../src/omnisharp/loggingEvents';
 
 suite("CsharpChannelObserver", () => {
     suiteSetup(() => should());
     [
         new InstallationFailure("someStage", "someError"),
-        new DownloadStart("somePackage"),
+        new PackageInstallStart(),
         new DebuggerNotInstalledFailure(),
         new DebuggerPrerequisiteFailure("some failure"),
         new ProjectJsonDeprecatedWarning()