Merge pull request #7531 from dotnet/dev/jorobich/move-shared-code

Author: JoeRobich

l10n/bundle.l10n.json

@@ -6,6 +6,15 @@
   "Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.": "Cannot create .NET debug configurations. The server is still initializing or has exited unexpectedly.",
   "Cannot create .NET debug configurations. The active C# project is not within folder '{0}'.": "Cannot create .NET debug configurations. The active C# project is not within folder '{0}'.",
   "Does not contain .NET Core projects.": "Does not contain .NET Core projects.",
+  "pipeArgs must be a string or a string array type": "pipeArgs must be a string or a string array type",
+  "Name not defined in current configuration.": "Name not defined in current configuration.",
+  "Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.",
+  "Select the process to attach to": "Select the process to attach to",
+  "Pipe transport failed to get OS and processes.": "Pipe transport failed to get OS and processes.",
+  "Operating system \"{0}\" not supported.": "Operating system \"{0}\" not supported.",
+  "Transport attach could not obtain processes list.": "Transport attach could not obtain processes list.",
+  "Error Message: ": "Error Message: ",
+  "See {0} output": "See {0} output",
   "'{0}' was not set in the debug configuration.": "'{0}' was not set in the debug configuration.",
   "'{0}' request is not supported for the '{1}' configuration.": "'{0}' request is not supported for the '{1}' configuration.",
   "'{0}' was not provided in the debug configuration.": "'{0}' was not provided in the debug configuration.",
@@ -143,15 +152,6 @@
   "Package {0} download from {1} failed integrity check. Some features may not work as expected. Please restart Visual Studio Code to retrigger the download": "Package {0} download from {1} failed integrity check. Some features may not work as expected. Please restart Visual Studio Code to retrigger the download",
   "Failed to run test: {0}": "Failed to run test: {0}",
   "Failed to start debugger: {0}": "Failed to start debugger: {0}",
-  "pipeArgs must be a string or a string array type": "pipeArgs must be a string or a string array type",
-  "Name not defined in current configuration.": "Name not defined in current configuration.",
-  "Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.": "Configuration \"{0}\" in launch.json does not have a {1} argument with {2} for remote process listing.",
-  "Select the process to attach to": "Select the process to attach to",
-  "Pipe transport failed to get OS and processes.": "Pipe transport failed to get OS and processes.",
-  "Operating system \"{0}\" not supported.": "Operating system \"{0}\" not supported.",
-  "Transport attach could not obtain processes list.": "Transport attach could not obtain processes list.",
-  "Error Message: ": "Error Message: ",
-  "See {0} output": "See {0} output",
   "Text editor must be focused to fix all issues": "Text editor must be focused to fix all issues",
   "Fix all issues": "Fix all issues",
   "Select fix all action": "Select fix all action",

src/coreclrDebug/activate.ts

@@ -12,11 +12,11 @@ import {
     DebuggerPrerequisiteWarning,
     DebuggerPrerequisiteFailure,
     DebuggerNotInstalledFailure,
-} from '../omnisharp/loggingEvents';
+} from '../shared/loggingEvents';
 import { EventStream } from '../eventStream';
 import { getRuntimeDependencyPackageWithId } from '../tools/runtimeDependencyPackageUtils';
 import { getDotnetInfo } from '../shared/utils/getDotnetInfo';
-import { RemoteAttachPicker } from '../omnisharp/features/processPicker';
+import { RemoteAttachPicker } from '../shared/processPicker';
 import CompositeDisposable from '../compositeDisposable';
 import { BaseVsDbgConfigurationProvider } from '../shared/configurationProvider';
 import { omnisharpOptions } from '../shared/options';

src/eventStream.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { Subject, Subscription } from 'rxjs';
-import { BaseEvent } from './omnisharp/loggingEvents';
+import { BaseEvent } from './shared/loggingEvents';
 
 export class EventStream {
     private sink: Subject<BaseEvent>;

src/installRuntimeDependencies.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { PlatformInformation } from './shared/platform';
-import { PackageInstallation, LogPlatformInfo, InstallationSuccess } from './omnisharp/loggingEvents';
+import { PackageInstallation, LogPlatformInfo, InstallationSuccess } from './shared/loggingEvents';
 import { EventStream } from './eventStream';
 import { getRuntimeDependenciesPackages } from './tools/runtimeDependencyPackageUtils';
 import { getAbsolutePathPackagesToInstall } from './packageManager/getAbsolutePathPackagesToInstall';

src/main.ts

@@ -7,12 +7,11 @@ import * as coreclrdebug from './coreclrDebug/activate';
 import * as util from './common';
 import * as vscode from 'vscode';
 
-import { ActivationFailure, ActiveTextEditorChanged } from './omnisharp/loggingEvents';
+import { ActivationFailure } from './shared/loggingEvents';
 import { CsharpChannelObserver } from './shared/observers/csharpChannelObserver';
 import { CsharpLoggerObserver } from './shared/observers/csharpLoggerObserver';
 import { EventStream } from './eventStream';
 import { PlatformInformation } from './shared/platform';
-import { TelemetryObserver } from './omnisharp/observers/telemetryObserver';
 import TelemetryReporter from '@vscode/extension-telemetry';
 import { vscodeNetworkSettingsProvider } from './networkSettings';
 import createOptionStream from './shared/observables/createOptionStream';
@@ -33,7 +32,6 @@ import { CSharpExtensionExports, OmnisharpExtensionExports } from './csharpExten
 import { csharpDevkitExtensionId, getCSharpDevKit } from './utils/getCSharpDevKit';
 import { BlazorDebugConfigurationProvider } from './razor/src/blazorDebug/blazorDebugConfigurationProvider';
 import { RoslynLanguageServerExport } from './lsptoolshost/roslynLanguageServerExportChannel';
-import { registerOmnisharpOptionChanges } from './omnisharp/omnisharpOptionChanges';
 import { RoslynLanguageServerEvents } from './lsptoolshost/languageServerEvents';
 import { ServerState } from './lsptoolshost/serverStateChange';
 import { SolutionSnapshotProvider } from './lsptoolshost/services/solutionSnapshotProvider';
@@ -87,12 +85,8 @@ export async function activate(
     // If the dotnet bundle is installed, this will ensure the dotnet CLI is on the path.
     await initializeDotnetPath();
 
-    const useModernNetOption = omnisharpOptions.useModernNet;
-    const telemetryObserver = new TelemetryObserver(platformInfo, () => reporter, useModernNetOption);
-    eventStream.subscribe(telemetryObserver.post);
-
     const networkSettingsProvider = vscodeNetworkSettingsProvider(vscode);
-    const useFramework = useOmnisharpServer && useModernNetOption !== true;
+    const useFramework = useOmnisharpServer && omnisharpOptions.useModernNet !== true;
     const installDependencies: IInstallDependencies = async (dependencies: AbsolutePathPackage[]) =>
         downloadAndInstallPackages(dependencies, networkSettingsProvider, eventStream, isValidDownload);
     const runtimeDependenciesExist = await ensureRuntimeDependencies(
@@ -156,19 +150,13 @@ export async function activate(
         omnisharpLangServicePromise = activateOmniSharpLanguageServer(
             context,
             platformInfo,
+            optionStream,
             networkSettingsProvider,
             eventStream,
             csharpChannel,
             dotnetTestChannel,
-            dotnetChannel
-        );
-
-        context.subscriptions.push(registerOmnisharpOptionChanges(optionStream));
-
-        context.subscriptions.push(
-            vscode.window.onDidChangeActiveTextEditor(() => {
-                eventStream.post(new ActiveTextEditorChanged());
-            })
+            dotnetChannel,
+            reporter
         );
 
         if (!razorOptions.razorDevMode) {
@@ -198,7 +186,7 @@ export async function activate(
             await vscode.window.showErrorMessage(errorMessage, setupButton).then((selectedItem) => {
                 if (selectedItem === setupButton) {
                     const remoteDebugInfoURL =
-                        'https://github.com/OmniSharp/omnisharp-vscode/wiki/Remote-Debugging-On-Linux-Arm';
+                        'https://github.com/dotnet/vscode-csharp/wiki/Remote-Debugging-On-Linux-Arm';
                     vscode.env.openExternal(vscode.Uri.parse(remoteDebugInfoURL));
                 }
             });

src/omnisharp/engines/lspEngine.ts

@@ -9,7 +9,7 @@ import { configure } from '../launcher';
 import { LaunchTarget } from '../../shared/launchTarget';
 import { EventEmitter } from 'events';
 import { setTimeout } from 'timers';
-import * as ObservableEvents from '../loggingEvents';
+import * as ObservableEvents from '../omnisharpLoggingEvents';
 import { EventStream } from '../../eventStream';
 import CompositeDisposable from '../../compositeDisposable';
 import Disposable from '../../disposable';

src/omnisharp/engines/stdioEngine.ts

@@ -15,7 +15,7 @@ import { omnisharpOptions } from '../../shared/options';
 import { PlatformInformation } from '../../shared/platform';
 import { launchOmniSharp } from '../launcher';
 import { setTimeout } from 'timers';
-import * as ObservableEvents from '../loggingEvents';
+import * as ObservableEvents from '../omnisharpLoggingEvents';
 import { EventStream } from '../../eventStream';
 import CompositeDisposable from '../../compositeDisposable';
 import Disposable from '../../disposable';

src/omnisharp/features/commands.ts

@@ -19,7 +19,7 @@ import {
     CommandDotNetRestoreProgress,
     CommandDotNetRestoreSucceeded,
     CommandDotNetRestoreFailed,
-} from '../loggingEvents';
+} from '../omnisharpLoggingEvents';
 import { EventStream } from '../../eventStream';
 import { PlatformInformation } from '../../shared/platform';
 import CompositeDisposable from '../../compositeDisposable';

src/omnisharp/features/dotnetTest.ts

@@ -28,7 +28,7 @@ import {
     DotNetTestDebugStartFailure,
     DotNetTestRunInContextStart,
     DotNetTestDebugInContextStart,
-} from '../loggingEvents';
+} from '../omnisharpLoggingEvents';
 import { EventStream } from '../../eventStream';
 import LaunchConfiguration from './launchConfiguration';
 import Disposable from '../../disposable';

src/omnisharp/features/virtualDocumentTracker.ts

@@ -10,7 +10,7 @@ import { FileChangeType } from '../protocol';
 import { IDisposable } from '../../disposable';
 import CompositeDisposable from '../../compositeDisposable';
 import { EventStream } from '../../eventStream';
-import { DocumentSynchronizationFailure } from '../loggingEvents';
+import { DocumentSynchronizationFailure } from '../omnisharpLoggingEvents';
 
 async function trackCurrentVirtualDocuments(server: OmniSharpServer, eventStream: EventStream) {
     for (let i = 0; i < workspace.textDocuments.length; i++) {