microsoft · DonJayamanne · Oct 9, 2018 · Oct 2, 2018 · Oct 2, 2018 · Oct 9, 2018
diff --git a/news/3 Code Health/2748.MD b/news/3 Code Health/2748.MD
@@ -0,0 +1 @@
+Move contents of the folder `src/utils` into `src/client/common/utils`.
diff --git a/src/client/activation/activationService.ts b/src/client/activation/activationService.ts
@@ -8,7 +8,6 @@ import {
     ConfigurationChangeEvent, Disposable,
     OutputChannel, Uri
 } from 'vscode';
-import { OSDistro, OSType } from '../../utils/platform';
 import {
     IApplicationShell, ICommandManager,
     IWorkspaceService
@@ -20,6 +19,7 @@ import {
     IConfigurationService, IDisposableRegistry,
     IOutputChannel, IPythonSettings
 } from '../common/types';
+import { OSDistro, OSType } from '../common/utils/platform';
 import { IServiceContainer } from '../ioc/types';
 import { PYTHON_LANGUAGE_SERVER_PLATFORM_NOT_SUPPORTED } from '../telemetry/constants';
 import { getTelemetryReporter } from '../telemetry/telemetry';

diff --git a/src/client/activation/downloader.ts b/src/client/activation/downloader.ts
@@ -6,11 +6,11 @@
 import * as path from 'path';
 import * as requestProgress from 'request-progress';
 import { ProgressLocation, window } from 'vscode';
-import { createDeferred } from '../../utils/async';
-import { StopWatch } from '../../utils/stopWatch';
 import { STANDARD_OUTPUT_CHANNEL } from '../common/constants';
 import { IFileSystem } from '../common/platform/types';
 import { IExtensionContext, IOutputChannel } from '../common/types';
+import { createDeferred } from '../common/utils/async';
+import { StopWatch } from '../common/utils/stopWatch';
 import { IServiceContainer } from '../ioc/types';
 import { sendTelemetryEvent } from '../telemetry';
 import {

diff --git a/src/client/activation/hashVerifier.ts b/src/client/activation/hashVerifier.ts
@@ -3,7 +3,7 @@
 
 import { createHash } from 'crypto';
 import * as fs from 'fs';
-import { createDeferred } from '../../utils/async';
+import { createDeferred } from '../common/utils/async';
 
 export class HashVerifier {
     public async verifyHash(filePath: string, platformString: string, expectedDigest: string): Promise<boolean> {

diff --git a/src/client/activation/interpreterDataService.ts b/src/client/activation/interpreterDataService.ts
@@ -5,11 +5,11 @@ import { createHash } from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
 import { ExtensionContext, Uri } from 'vscode';
-import { createDeferred } from '../../utils/async';
 import { IApplicationShell } from '../common/application/types';
 import '../common/extensions';
 import { IPlatformService } from '../common/platform/types';
 import { IPythonExecutionFactory, IPythonExecutionService } from '../common/process/types';
+import { createDeferred } from '../common/utils/async';
 import { IServiceContainer } from '../ioc/types';
 
 const DataVersion = 1;

diff --git a/src/client/activation/languageServer/languageServer.ts b/src/client/activation/languageServer/languageServer.ts
@@ -13,8 +13,6 @@ import {
     Disposable, LanguageClient, LanguageClientOptions,
     ProvideCompletionItemsSignature, ServerOptions
 } from 'vscode-languageclient';
-import { createDeferred, Deferred } from '../../../utils/async';
-import { StopWatch } from '../../../utils/stopWatch';
 import {
     IApplicationShell, ICommandManager, IWorkspaceService
 } from '../../common/application/types';
@@ -27,6 +25,8 @@ import {
     IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, ILogger,
     IOutputChannel, IPathUtils, IPythonExtensionBanner, IPythonSettings
 } from '../../common/types';
+import { createDeferred, Deferred } from '../../common/utils/async';
+import { StopWatch } from '../../common/utils/stopWatch';
 import { IEnvironmentVariablesProvider } from '../../common/variables/types';
 import { IServiceContainer } from '../../ioc/types';
 import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';

diff --git a/src/client/activation/languageServer/languageServerPackageService.ts b/src/client/activation/languageServer/languageServerPackageService.ts
@@ -5,12 +5,12 @@
 
 import { inject, injectable } from 'inversify';
 import { parse } from 'semver';
-import { Architecture, OSType } from '../../../utils/platform';
 import { PVSC_EXTENSION_ID } from '../../common/constants';
 import { log } from '../../common/logger';
 import { INugetRepository, INugetService, NugetPackage } from '../../common/nuget/types';
 import { IPlatformService } from '../../common/platform/types';
 import { IConfigurationService, IExtensions, LanguageServerDownloadChannels } from '../../common/types';
+import { Architecture, OSType } from '../../common/utils/platform';
 import { IServiceContainer } from '../../ioc/types';
 import { PlatformName } from '../platformData';
 import { ILanguageServerPackageService } from '../types';

diff --git a/src/client/activation/progress.ts b/src/client/activation/progress.ts
@@ -3,8 +3,8 @@
 
 import { Progress, ProgressLocation, window } from 'vscode';
 import { Disposable, LanguageClient } from 'vscode-languageclient';
-import { createDeferred, Deferred } from '../../utils/async';
-import { StopWatch } from '../../utils/stopWatch';
+import { createDeferred, Deferred } from '../common/utils/async';
+import { StopWatch } from '../common/utils/stopWatch';
 import { sendTelemetryEvent } from '../telemetry';
 import { PYTHON_LANGUAGE_SERVER_ANALYSISTIME } from '../telemetry/constants';
 

diff --git a/src/client/common/installer/moduleInstaller.ts b/src/client/common/installer/moduleInstaller.ts
@@ -8,12 +8,12 @@ import * as fs from 'fs';
 import { injectable } from 'inversify';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import { noop } from '../../../utils/misc';
 import { IInterpreterService, InterpreterType } from '../../interpreter/contracts';
 import { IServiceContainer } from '../../ioc/types';
 import { STANDARD_OUTPUT_CHANNEL } from '../constants';
 import { ITerminalServiceFactory } from '../terminal/types';
 import { ExecutionInfo, IConfigurationService, IOutputChannel } from '../types';
+import { noop } from '../utils/misc';
 
 @injectable()
 export abstract class ModuleInstaller {

diff --git a/src/client/common/net/socket/socketServer.ts b/src/client/common/net/socket/socketServer.ts
@@ -1,9 +1,9 @@
 import { EventEmitter } from 'events';
 import { injectable } from 'inversify';
 import * as net from 'net';
-import { createDeferred, Deferred } from '../../../../utils/async';
-import { noop } from '../../../../utils/misc';
 import { ISocketServer } from '../../types';
+import { createDeferred, Deferred } from '../../utils/async';
+import { noop } from '../../utils/misc';
 
 @injectable()
 export class SocketServer extends EventEmitter implements ISocketServer {

diff --git a/src/client/common/platform/fileSystem.ts b/src/client/common/platform/fileSystem.ts
@@ -9,7 +9,7 @@ import * as glob from 'glob';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import * as tmp from 'tmp';
-import { createDeferred } from '../../../utils/async';
+import { createDeferred } from '../utils/async';
 import { IFileSystem, IPlatformService, TemporaryFile } from './types';
 
 @injectable()

diff --git a/src/client/common/platform/osinfo.ts b/src/client/common/platform/osinfo.ts
@@ -3,7 +3,7 @@
 
 'use strict';
 
-import { Info as PlatformInfo, isWindows } from '../../../utils/platform';
+import { Info as PlatformInfo, isWindows } from '../utils/platform';
 import {
     NON_WINDOWS_PATH_VARIABLE_NAME,
     WINDOWS_PATH_VARIABLE_NAME

diff --git a/src/client/common/platform/platformService.ts b/src/client/common/platform/platformService.ts
@@ -3,7 +3,7 @@
 'use strict';
 
 import { injectable } from 'inversify';
-import * as platform from '../../../utils/platform';
+import * as platform from '../utils/platform';
 import * as osinfo from './osinfo';
 import { IPlatformService } from './types';
 

diff --git a/src/client/common/platform/registry.ts b/src/client/common/platform/registry.ts
@@ -1,6 +1,6 @@
 import { injectable } from 'inversify';
 import * as Registry from 'winreg';
-import { Architecture } from '../../../utils/platform';
+import { Architecture } from '../utils/platform';
 import { IRegistry, RegistryHive } from './types';
 
 enum RegistryArchitectures {

diff --git a/src/client/common/platform/types.ts b/src/client/common/platform/types.ts
@@ -4,7 +4,7 @@
 import * as fs from 'fs';
 import * as semver from 'semver';
 import { Disposable } from 'vscode';
-import { Architecture, OSDistro, OSType } from '../../../utils/platform';
+import { Architecture, OSDistro, OSType } from '../utils/platform';
 
 export const IPlatformInfo = Symbol('IPlatformInfo');
 export interface IPlatformInfo {

diff --git a/src/client/common/process/proc.ts b/src/client/common/process/proc.ts
@@ -6,7 +6,7 @@
 import { spawn } from 'child_process';
 import { Observable } from 'rxjs/Observable';
 import { Disposable } from 'vscode';
-import { createDeferred } from '../../../utils/async';
+import { createDeferred } from '../utils/async';
 import { EnvironmentVariables } from '../variables/types';
 import { DEFAULT_ENCODING } from './constants';
 import { ExecutionResult, IBufferDecoder, IProcessService, ObservableExecutionResult, Output, SpawnOptions, StdErrError } from './types';

diff --git a/src/client/common/process/pythonProcess.ts b/src/client/common/process/pythonProcess.ts
@@ -3,12 +3,12 @@
 
 import { injectable } from 'inversify';
 import * as path from 'path';
-import { Architecture } from '../../../utils/platform';
 import { IServiceContainer } from '../../ioc/types';
 import { EXTENSION_ROOT_DIR } from '../constants';
 import { ErrorUtils } from '../errors/errorUtils';
 import { ModuleNotInstalledError } from '../errors/moduleNotInstalledError';
 import { IFileSystem } from '../platform/types';
+import { Architecture } from '../utils/platform';
 import { ExecutionResult, InterpreterInfomation, IProcessService, IPythonExecutionService, ObservableExecutionResult, PythonVersionInfo, SpawnOptions } from './types';
 
 @injectable()

diff --git a/src/client/common/process/types.ts b/src/client/common/process/types.ts
@@ -4,8 +4,8 @@
 import { ChildProcess, SpawnOptions as ChildProcessSpawnOptions } from 'child_process';
 import { Observable } from 'rxjs/Observable';
 import { CancellationToken, Uri } from 'vscode';
-import { Architecture } from '../../../utils/platform';
 import { ExecutionInfo } from '../types';
+import { Architecture } from '../utils/platform';
 import { EnvironmentVariables } from '../variables/types';
 
 export const IBufferDecoder = Symbol('IBufferDecoder');

diff --git a/src/client/common/serviceRegistry.ts b/src/client/common/serviceRegistry.ts
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import { Random } from '../../utils/random';
 import { IHttpClient } from '../activation/types';
 import { IServiceManager } from '../ioc/types';
 import { ApplicationEnvironment } from './application/applicationEnvironment';
@@ -46,6 +45,7 @@ import {
     IFeatureDeprecationManager, IInstaller,
     ILogger, IPathUtils, IPersistentStateFactory, IRandom, Is64Bit, IsWindows
 } from './types';
+import { Random } from './utils/random';
 
 export function registerTypes(serviceManager: IServiceManager) {
     serviceManager.addSingletonInstance<boolean>(IsWindows, IS_WINDOWS);

diff --git a/src/client/common/terminal/helper.ts b/src/client/common/terminal/helper.ts
@@ -3,13 +3,13 @@
 
 import { inject, injectable } from 'inversify';
 import { Terminal, Uri } from 'vscode';
-import { sleep } from '../../../utils/async';
 import { ICondaService } from '../../interpreter/contracts';
 import { IServiceContainer } from '../../ioc/types';
 import { ITerminalManager, IWorkspaceService } from '../application/types';
 import '../extensions';
 import { IPlatformService } from '../platform/types';
 import { IConfigurationService } from '../types';
+import { sleep } from '../utils/async';
 import { CondaActivationCommandProvider } from './environmentActivationProviders/condaActivationProvider';
 import { ITerminalActivationCommandProvider, ITerminalHelper, TerminalShellType } from './types';
 

diff --git a/src/utils/async.ts → src/client/common/utils/async.ts b/src/utils/async.ts → src/client/common/utils/async.ts
diff --git a/src/utils/decorators.ts → src/client/common/utils/decorators.ts b/src/utils/decorators.ts → src/client/common/utils/decorators.ts
diff --git a/src/utils/enum.ts → src/client/common/utils/enum.ts b/src/utils/enum.ts → src/client/common/utils/enum.ts
diff --git a/src/utils/fs.ts → src/client/common/utils/fs.ts b/src/utils/fs.ts → src/client/common/utils/fs.ts
diff --git a/src/utils/localize.ts → src/client/common/utils/localize.ts b/src/utils/localize.ts → src/client/common/utils/localize.ts
@@ -5,7 +5,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-import { EXTENSION_ROOT_DIR } from '../client/common/constants';
+import { EXTENSION_ROOT_DIR } from '../constants';
 
 // External callers of localize use these tables to retrieve localized values.
 export namespace LanguageServiceSurveyBanner {
@@ -16,8 +16,8 @@ export namespace LanguageServiceSurveyBanner {
 
 // Skip using vscode-nls and instead just compute our strings based on key values. Key values
 // can be loaded out of the nls.<locale>.json files
-let loadedCollection: { [index: string]: string } | undefined ;
-let defaultCollection: { [index: string]: string } | undefined ;
+let loadedCollection: { [index: string]: string } | undefined;
+let defaultCollection: { [index: string]: string } | undefined;
 let loadedLocale: string;
 
 function localize(key: string, defValue: string) {
@@ -27,7 +27,7 @@ function localize(key: string, defValue: string) {
     };
 }
 
-function parseLocale() : string {
+function parseLocale(): string {
     // Attempt to load from the vscode locale. If not there, use english
     const vscodeConfigString = process.env.VSCODE_NLS_CONFIG;
     return vscodeConfigString ? JSON.parse(vscodeConfigString).locale : 'en-us';

diff --git a/src/utils/logging.ts → src/client/common/utils/logging.ts b/src/utils/logging.ts → src/client/common/utils/logging.ts
diff --git a/src/utils/misc.ts → src/client/common/utils/misc.ts b/src/utils/misc.ts → src/client/common/utils/misc.ts
diff --git a/src/utils/platform.ts → src/client/common/utils/platform.ts b/src/utils/platform.ts → src/client/common/utils/platform.ts
@@ -6,7 +6,7 @@
 import * as getos from 'getos';
 import * as os from 'os';
 import * as semver from 'semver';
-import { IPlatformInfo } from '../client/common/platform/types';
+import { IPlatformInfo } from '../platform/types';
 import { parseVersion } from './version';
 
 export enum Architecture {

diff --git a/src/utils/random.ts → src/client/common/utils/random.ts b/src/utils/random.ts → src/client/common/utils/random.ts
@@ -5,7 +5,7 @@
 
 import * as crypto from 'crypto';
 import { injectable } from 'inversify';
-import { IRandom } from '../client/common/types';
+import { IRandom } from '../types';
 
 function getRandom(): number {
     let num: number = 0;

diff --git a/src/utils/stopWatch.ts → src/client/common/utils/stopWatch.ts b/src/utils/stopWatch.ts → src/client/common/utils/stopWatch.ts
diff --git a/src/utils/string.ts → src/client/common/utils/string.ts b/src/utils/string.ts → src/client/common/utils/string.ts
diff --git a/src/utils/sysTypes.ts → src/client/common/utils/sysTypes.ts b/src/utils/sysTypes.ts → src/client/common/utils/sysTypes.ts
diff --git a/src/utils/text.ts → src/client/common/utils/text.ts b/src/utils/text.ts → src/client/common/utils/text.ts
diff --git a/src/utils/version.ts → src/client/common/utils/version.ts b/src/utils/version.ts → src/client/common/utils/version.ts
diff --git a/src/client/common/variables/sysTypes.ts b/src/client/common/variables/sysTypes.ts
@@ -6,7 +6,7 @@
 
 // tslint:disable:no-any no-increment-decrement
 
-import { isFunction, isString } from '../../../utils/sysTypes';
+import { isFunction, isString } from '../utils/sysTypes';
 
 export type TypeConstraint = string | Function;
 

diff --git a/src/client/common/variables/systemVariables.ts b/src/client/common/variables/systemVariables.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import * as Path from 'path';
-import * as Types from '../../../utils/sysTypes';
+import * as Types from '../utils/sysTypes';
 import { IStringDictionary, ISystemVariables } from './types';
 /* tslint:disable:rule1 no-any no-unnecessary-callback-wrapper jsdoc-format no-for-in prefer-const no-increment-decrement */
 

diff --git a/src/client/debugger/Common/telemetry.ts b/src/client/debugger/Common/telemetry.ts
@@ -4,7 +4,7 @@
 // tslint:disable:no-function-expression no-any no-invalid-this no-use-before-declare
 
 import { DebugSession, StoppedEvent } from 'vscode-debugadapter';
-import { StopWatch } from '../../../utils/stopWatch';
+import { StopWatch } from '../../common/utils/stopWatch';
 import { DEBUGGER_PERFORMANCE } from '../../telemetry/constants';
 import { DebuggerPerformanceTelemetry } from '../../telemetry/types';
 import { TelemetryEvent } from './Contracts';

diff --git a/src/client/debugger/DebugClients/LocalDebugClient.ts b/src/client/debugger/DebugClients/LocalDebugClient.ts
@@ -2,10 +2,10 @@ import { ChildProcess, spawn } from 'child_process';
 import * as path from 'path';
 import { DebugSession, OutputEvent } from 'vscode-debugadapter';
 import { DebugProtocol } from 'vscode-debugprotocol';
-import { noop } from '../../../utils/misc';
 import { open } from '../../common/open';
 import { PathUtils } from '../../common/platform/pathUtils';
 import { CurrentProcess } from '../../common/process/currentProcess';
+import { noop } from '../../common/utils/misc';
 import { EnvironmentVariablesService } from '../../common/variables/environment';
 import { IServiceContainer } from '../../ioc/types';
 import { DebugOptions, IDebugServer, IPythonProcess, LaunchRequestArguments } from '../Common/Contracts';

diff --git a/src/client/debugger/DebugServers/BaseDebugServer.ts b/src/client/debugger/DebugServers/BaseDebugServer.ts
@@ -5,7 +5,7 @@ import { DebugSession } from 'vscode-debugadapter';
 import { IPythonProcess, IDebugServer } from '../Common/Contracts';
 import { EventEmitter } from 'events';
 import { Socket } from 'net';
-import { Deferred, createDeferred } from '../../../utils/async';
+import { Deferred, createDeferred } from '../../common/utils/async';
 
 export abstract class BaseDebugServer extends EventEmitter {
     protected clientSocket: Deferred<Socket>;

diff --git a/src/client/debugger/DebugServers/LocalDebugServerV2.ts b/src/client/debugger/DebugServers/LocalDebugServerV2.ts
@@ -6,8 +6,8 @@
 
 import * as net from 'net';
 import { DebugSession } from 'vscode-debugadapter';
-import { createDeferred } from '../../../utils/async';
 import { ISocketServer } from '../../common/types';
+import { createDeferred } from '../../common/utils/async';
 import { IServiceContainer } from '../../ioc/types';
 import { IDebugServer, LaunchRequestArguments } from '../Common/Contracts';
 import { BaseDebugServer } from './BaseDebugServer';

diff --git a/src/client/debugger/mainV2.ts b/src/client/debugger/mainV2.ts
@@ -18,11 +18,11 @@ import { DebugSession, ErrorDestination, Event, logger, OutputEvent, Response, T
 import { LogLevel } from 'vscode-debugadapter/lib/logger';
 import { DebugProtocol } from 'vscode-debugprotocol';
 import '../../client/common/extensions';
-import { createDeferred, Deferred, sleep } from '../../utils/async';
-import { noop } from '../../utils/misc';
 import { isNotInstalledError } from '../common/helpers';
 import { IFileSystem } from '../common/platform/types';
 import { ICurrentProcess } from '../common/types';
+import { createDeferred, Deferred, sleep } from '../common/utils/async';
+import { noop } from '../common/utils/misc';
 import { IServiceContainer } from '../ioc/types';
 import { AttachRequestArguments, LaunchRequestArguments } from './Common/Contracts';
 import { CreateAttachDebugClient, CreateLaunchDebugClient } from './DebugClients/DebugFactory';

diff --git a/src/client/extension.ts b/src/client/extension.ts
@@ -5,13 +5,12 @@ if ((Reflect as any).metadata === undefined) {
     // tslint:disable-next-line:no-require-imports no-var-requires
     require('reflect-metadata');
 }
-import { StopWatch } from '../utils/stopWatch';
+import { StopWatch } from './common/utils/stopWatch';
 // Do not move this linne of code (used to measure extension load times).
 const stopWatch = new StopWatch();
 
 import { Container } from 'inversify';
 import { CodeActionKind, debug, Disposable, ExtensionContext, extensions, IndentAction, languages, Memento, OutputChannel, window } from 'vscode';
-import { createDeferred } from '../utils/async';
 import { registerTypes as activationRegisterTypes } from './activation/serviceRegistry';
 import { IExtensionActivationService } from './activation/types';
 import { IExtensionApi } from './api';
@@ -29,6 +28,7 @@ import {
     IExtensionContext, IFeatureDeprecationManager, ILogger,
     IMemento, IOutputChannel, WORKSPACE_MEMENTO
 } from './common/types';
+import { createDeferred } from './common/utils/async';
 import { registerTypes as variableRegisterTypes } from './common/variables/serviceRegistry';
 import { AttachRequestArguments, LaunchRequestArguments } from './debugger/Common/Contracts';
 import { BaseConfigurationProvider } from './debugger/configProviders/baseProvider';

diff --git a/src/client/formatters/autoPep8Formatter.ts b/src/client/formatters/autoPep8Formatter.ts
@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
-import { StopWatch } from '../../utils/stopWatch';
 import { Product } from '../common/installer/productInstaller';
 import { IConfigurationService } from '../common/types';
+import { StopWatch } from '../common/utils/stopWatch';
 import { IServiceContainer } from '../ioc/types';
 import { sendTelemetryWhenDone } from '../telemetry';
 import { FORMAT } from '../telemetry/constants';

diff --git a/src/client/formatters/blackFormatter.ts b/src/client/formatters/blackFormatter.ts
@@ -4,9 +4,9 @@
 'use strict';
 
 import * as vscode from 'vscode';
-import { StopWatch } from '../../utils/stopWatch';
 import { Product } from '../common/installer/productInstaller';
 import { IConfigurationService } from '../common/types';
+import { StopWatch } from '../common/utils/stopWatch';
 import { IServiceContainer } from '../ioc/types';
 import { sendTelemetryWhenDone } from '../telemetry';
 import { FORMAT } from '../telemetry/constants';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Move contents of the folder `src/utils` into `src/client/common/utils`.