Skip to content

Commit 90aedaa

Browse files
DonJayamanneDonJayamanne
authored
Move utils into common folder (#2749)
* Move utils into common folder * Add news entry * Moved files into common/utils * Fixed merge issues * Move tests for utils
1 parent eecb4dd commit 90aedaa

File tree

133 files changed

+154
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+154
-153
lines changed

‎news/3 Code Health/2748.MD‎

Lines changed: 1 addition & 0 deletions

‎src/client/activation/activationService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
ConfigurationChangeEvent, Disposable,
99
OutputChannel, Uri
1010
} from 'vscode';
11-
import { OSDistro, OSType } from '../../utils/platform';
1211
import {
1312
IApplicationShell, ICommandManager,
1413
IWorkspaceService
@@ -20,6 +19,7 @@ import {
2019
IConfigurationService, IDisposableRegistry,
2120
IOutputChannel, IPythonSettings
2221
} from '../common/types';
22+
import { OSDistro, OSType } from '../common/utils/platform';
2323
import { IServiceContainer } from '../ioc/types';
2424
import { PYTHON_LANGUAGE_SERVER_PLATFORM_NOT_SUPPORTED } from '../telemetry/constants';
2525
import { getTelemetryReporter } from '../telemetry/telemetry';

‎src/client/activation/downloader.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import * as path from 'path';
77
import * as requestProgress from 'request-progress';
88
import { ProgressLocation, window } from 'vscode';
9-
import { createDeferred } from '../../utils/async';
10-
import { StopWatch } from '../../utils/stopWatch';
119
import { STANDARD_OUTPUT_CHANNEL } from '../common/constants';
1210
import { IFileSystem } from '../common/platform/types';
1311
import { IExtensionContext, IOutputChannel } from '../common/types';
12+
import { createDeferred } from '../common/utils/async';
13+
import { StopWatch } from '../common/utils/stopWatch';
1414
import { IServiceContainer } from '../ioc/types';
1515
import { sendTelemetryEvent } from '../telemetry';
1616
import {

‎src/client/activation/hashVerifier.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import { createHash } from 'crypto';
55
import * as fs from 'fs';
6-
import { createDeferred } from '../../utils/async';
6+
import { createDeferred } from '../common/utils/async';
77

88
export class HashVerifier {
99
public async verifyHash(filePath: string, platformString: string, expectedDigest: string): Promise<boolean> {

‎src/client/activation/interpreterDataService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import { createHash } from 'crypto';
55
import * as fs from 'fs';
66
import * as path from 'path';
77
import { ExtensionContext, Uri } from 'vscode';
8-
import { createDeferred } from '../../utils/async';
98
import { IApplicationShell } from '../common/application/types';
109
import '../common/extensions';
1110
import { IPlatformService } from '../common/platform/types';
1211
import { IPythonExecutionFactory, IPythonExecutionService } from '../common/process/types';
12+
import { createDeferred } from '../common/utils/async';
1313
import { IServiceContainer } from '../ioc/types';
1414

1515
const DataVersion = 1;

‎src/client/activation/languageServer/languageServer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import {
1313
Disposable, LanguageClient, LanguageClientOptions,
1414
ProvideCompletionItemsSignature, ServerOptions
1515
} from 'vscode-languageclient';
16-
import { createDeferred, Deferred } from '../../../utils/async';
17-
import { StopWatch } from '../../../utils/stopWatch';
1816
import {
1917
IApplicationShell, ICommandManager, IWorkspaceService
2018
} from '../../common/application/types';
@@ -27,6 +25,8 @@ import {
2725
IDisposableRegistry, IExtensionContext, IFeatureDeprecationManager, ILogger,
2826
IOutputChannel, IPathUtils, IPythonExtensionBanner, IPythonSettings
2927
} from '../../common/types';
28+
import { createDeferred, Deferred } from '../../common/utils/async';
29+
import { StopWatch } from '../../common/utils/stopWatch';
3030
import { IEnvironmentVariablesProvider } from '../../common/variables/types';
3131
import { IServiceContainer } from '../../ioc/types';
3232
import { LanguageServerSymbolProvider } from '../../providers/symbolProvider';

‎src/client/activation/languageServer/languageServerPackageService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
import { inject, injectable } from 'inversify';
77
import { parse } from 'semver';
8-
import { Architecture, OSType } from '../../../utils/platform';
98
import { PVSC_EXTENSION_ID } from '../../common/constants';
109
import { log } from '../../common/logger';
1110
import { INugetRepository, INugetService, NugetPackage } from '../../common/nuget/types';
1211
import { IPlatformService } from '../../common/platform/types';
1312
import { IConfigurationService, IExtensions, LanguageServerDownloadChannels } from '../../common/types';
13+
import { Architecture, OSType } from '../../common/utils/platform';
1414
import { IServiceContainer } from '../../ioc/types';
1515
import { PlatformName } from '../platformData';
1616
import { ILanguageServerPackageService } from '../types';

‎src/client/activation/progress.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import { Progress, ProgressLocation, window } from 'vscode';
55
import { Disposable, LanguageClient } from 'vscode-languageclient';
6-
import { createDeferred, Deferred } from '../../utils/async';
7-
import { StopWatch } from '../../utils/stopWatch';
6+
import { createDeferred, Deferred } from '../common/utils/async';
7+
import { StopWatch } from '../common/utils/stopWatch';
88
import { sendTelemetryEvent } from '../telemetry';
99
import { PYTHON_LANGUAGE_SERVER_ANALYSISTIME } from '../telemetry/constants';
1010

‎src/client/common/installer/moduleInstaller.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import * as fs from 'fs';
88
import { injectable } from 'inversify';
99
import * as path from 'path';
1010
import * as vscode from 'vscode';
11-
import { noop } from '../../../utils/misc';
1211
import { IInterpreterService, InterpreterType } from '../../interpreter/contracts';
1312
import { IServiceContainer } from '../../ioc/types';
1413
import { STANDARD_OUTPUT_CHANNEL } from '../constants';
1514
import { ITerminalServiceFactory } from '../terminal/types';
1615
import { ExecutionInfo, IConfigurationService, IOutputChannel } from '../types';
16+
import { noop } from '../utils/misc';
1717

1818
@injectable()
1919
export abstract class ModuleInstaller {

‎src/client/common/net/socket/socketServer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { EventEmitter } from 'events';
22
import { injectable } from 'inversify';
33
import * as net from 'net';
4-
import { createDeferred, Deferred } from '../../../../utils/async';
5-
import { noop } from '../../../../utils/misc';
64
import { ISocketServer } from '../../types';
5+
import { createDeferred, Deferred } from '../../utils/async';
6+
import { noop } from '../../utils/misc';
77

88
@injectable()
99
export class SocketServer extends EventEmitter implements ISocketServer {

0 commit comments

Comments
 (0)