diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json index 297cd8991a52bc38546d3d463a61b17f3a9e2ef2..67da34845fa8c50548f4fd2f9480f2539fae1d16 100644 --- a/src/tsconfig.strictNullChecks.json +++ b/src/tsconfig.strictNullChecks.json @@ -348,8 +348,8 @@ "./vs/workbench/services/extensions/node/proxyIdentifier.ts", "./vs/workbench/services/extensions/node/rpcProtocol.ts", "./vs/workbench/services/extensions/test/node/rpcProtocol.test.ts", - "./vs/workbench/services/files/electron-browser/encoding.ts", - "./vs/workbench/services/files/electron-browser/streams.ts", + "./vs/workbench/services/files/node/encoding.ts", + "./vs/workbench/services/files/node/streams.ts", "./vs/workbench/services/files/test/electron-browser/utils.ts", "./vs/workbench/services/files/test/electron-browser/watcher.test.ts", "./vs/workbench/services/hash/common/hashService.ts", diff --git a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsTipsService.test.ts b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsTipsService.test.ts index 0cb6e6387c3cb3e398338a801cb6b0424a52ef5d..f295fadac57a01149d8635be7b45ac8cc85b9522 100644 --- a/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsTipsService.test.ts +++ b/src/vs/workbench/contrib/extensions/test/electron-browser/extensionsTipsService.test.ts @@ -27,7 +27,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { URI } from 'vs/base/common/uri'; import { testWorkspace } from 'vs/platform/workspace/test/common/testWorkspace'; import { IFileService } from 'vs/platform/files/common/files'; -import { FileService } from 'vs/workbench/services/files/electron-browser/fileService'; +import { FileService } from 'vs/workbench/services/files/node/fileService'; import * as extfs from 'vs/base/node/extfs'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { IPager } from 'vs/base/common/paging'; diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 3577f0e05d6eeff9440d1649a203736384173ca5..8b2077a42fcd6d6c6f8502f77e9bb35b345e5a6f 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -169,7 +169,7 @@ import { ProductService } from 'vs/platform/product/node/productService'; // import@electron-browser import { ContextMenuService as NativeContextMenuService } from 'vs/workbench/services/contextmenu/electron-browser/contextmenuService'; import { WorkbenchKeybindingService } from 'vs/workbench/services/keybinding/electron-browser/keybindingService'; -import { RemoteFileService } from 'vs/workbench/services/files/electron-browser/remoteFileService'; +import { RemoteFileService } from 'vs/workbench/services/files/node/remoteFileService'; import { ClipboardService } from 'vs/platform/clipboard/electron-browser/clipboardService'; import { LifecycleService } from 'vs/platform/lifecycle/electron-browser/lifecycleService'; import { IExtensionUrlHandler, ExtensionUrlHandler } from 'vs/workbench/services/extensions/electron-browser/inactiveExtensionUrlHandler'; diff --git a/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts b/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts index 181fd500468ad24ff1605ce5b1a11fe2fa74752a..5f1ea987873e4dc6f41e3994d6def7b5cc58871c 100644 --- a/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts +++ b/src/vs/workbench/services/backup/test/electron-browser/backupFileService.test.ts @@ -11,7 +11,7 @@ import * as path from 'vs/base/common/path'; import * as pfs from 'vs/base/node/pfs'; import { URI as Uri } from 'vs/base/common/uri'; import { BackupFileService, BackupFilesModel, hashPath } from 'vs/workbench/services/backup/node/backupFileService'; -import { FileService } from 'vs/workbench/services/files/electron-browser/fileService'; +import { FileService } from 'vs/workbench/services/files/node/fileService'; import { TextModel, createTextBufferFactory } from 'vs/editor/common/model/textModel'; import { TestContextService, TestTextResourceConfigurationService, TestLifecycleService, TestEnvironmentService, TestStorageService } from 'vs/workbench/test/workbenchTestServices'; import { getRandomTestPath } from 'vs/base/test/node/testUtils'; diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts index 09fbb2c580b4d17fe716324cd83172eca0b78bc8..970b00ae16bd77f74261ce24d8aee6346fd2c3b7 100644 --- a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts +++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts @@ -20,7 +20,7 @@ import { TestNotificationService } from 'vs/platform/notification/test/common/te import * as uuid from 'vs/base/common/uuid'; import { IConfigurationRegistry, Extensions as ConfigurationExtensions } from 'vs/platform/configuration/common/configurationRegistry'; import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService'; -import { FileService } from 'vs/workbench/services/files/electron-browser/fileService'; +import { FileService } from 'vs/workbench/services/files/node/fileService'; import { ConfigurationEditingService, ConfigurationEditingError, ConfigurationEditingErrorCode } from 'vs/workbench/services/configuration/node/configurationEditingService'; import { IFileService } from 'vs/platform/files/common/files'; import { WORKSPACE_STANDALONE_CONFIGURATIONS } from 'vs/workbench/services/configuration/common/configuration'; diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts index 19df41013d8c5de50e86669abe33725e506a7381..85220c194209ee02859bbf36ccbe90fff4221d15 100644 --- a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts +++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts @@ -24,7 +24,7 @@ import { IWorkspaceContextService, WorkbenchState, IWorkspaceFoldersChangeEvent import { ConfigurationTarget, IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'; import { workbenchInstantiationService, TestTextResourceConfigurationService, TestTextFileService, TestLifecycleService, TestEnvironmentService, TestStorageService } from 'vs/workbench/test/workbenchTestServices'; import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; -import { FileService } from 'vs/workbench/services/files/electron-browser/fileService'; +import { FileService } from 'vs/workbench/services/files/node/fileService'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; diff --git a/src/vs/workbench/services/dialogs/electron-browser/remoteFileDialog.ts b/src/vs/workbench/services/dialogs/electron-browser/remoteFileDialog.ts index 6e2ee8b968c2d709b311b517a4e9a6d0fdeb0990..d55892a1b2adc4c7f37baf2a76f5d616a3b099c0 100644 --- a/src/vs/workbench/services/dialogs/electron-browser/remoteFileDialog.ts +++ b/src/vs/workbench/services/dialogs/electron-browser/remoteFileDialog.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; import * as resources from 'vs/base/common/resources'; import * as objects from 'vs/base/common/objects'; -import { RemoteFileService } from 'vs/workbench/services/files/electron-browser/remoteFileService'; +import { RemoteFileService } from 'vs/workbench/services/files/node/remoteFileService'; import { IFileService, IFileStat, FileKind } from 'vs/platform/files/common/files'; import { IQuickInputService, IQuickPickItem, IQuickPick } from 'vs/platform/quickinput/common/quickInput'; import { URI } from 'vs/base/common/uri'; diff --git a/src/vs/workbench/services/files/electron-browser/encoding.ts b/src/vs/workbench/services/files/node/encoding.ts similarity index 100% rename from src/vs/workbench/services/files/electron-browser/encoding.ts rename to src/vs/workbench/services/files/node/encoding.ts diff --git a/src/vs/workbench/services/files/electron-browser/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts similarity index 99% rename from src/vs/workbench/services/files/electron-browser/fileService.ts rename to src/vs/workbench/services/files/node/fileService.ts index 9b3b9507adf5d1ba93327ee20a46c87562a4b3e7..f9b20baae2e733ce0107cb8b463accb70946899c 100644 --- a/src/vs/workbench/services/files/electron-browser/fileService.ts +++ b/src/vs/workbench/services/files/node/fileService.ts @@ -40,8 +40,8 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { onUnexpectedError } from 'vs/base/common/errors'; import product from 'vs/platform/product/node/product'; -import { IEncodingOverride, ResourceEncodings } from 'vs/workbench/services/files/electron-browser/encoding'; -import { createReadableOfSnapshot } from 'vs/workbench/services/files/electron-browser/streams'; +import { IEncodingOverride, ResourceEncodings } from 'vs/workbench/services/files/node/encoding'; +import { createReadableOfSnapshot } from 'vs/workbench/services/files/node/streams'; export interface IFileServiceTestOptions { disableWatcher?: boolean; diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/node/remoteFileService.ts similarity index 99% rename from src/vs/workbench/services/files/electron-browser/remoteFileService.ts rename to src/vs/workbench/services/files/node/remoteFileService.ts index 1edead97b2a3f3be40aa8f0aaba33ef7165ab806..e9beb32812ce1466341443b57915d44049255f1b 100644 --- a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts +++ b/src/vs/workbench/services/files/node/remoteFileService.ts @@ -20,8 +20,8 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { IStorageService } from 'vs/platform/storage/common/storage'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; -import { FileService } from 'vs/workbench/services/files/electron-browser/fileService'; -import { createReadableOfProvider, createReadableOfSnapshot, createWritableOfProvider } from 'vs/workbench/services/files/electron-browser/streams'; +import { FileService } from 'vs/workbench/services/files/node/fileService'; +import { createReadableOfProvider, createReadableOfSnapshot, createWritableOfProvider } from 'vs/workbench/services/files/node/streams'; class TypeOnlyStat implements IStat { diff --git a/src/vs/workbench/services/files/electron-browser/streams.ts b/src/vs/workbench/services/files/node/streams.ts similarity index 100% rename from src/vs/workbench/services/files/electron-browser/streams.ts rename to src/vs/workbench/services/files/node/streams.ts diff --git a/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts b/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts index 279e1e47c5d56f637303378b19b46efdc3246953..b3717e88f525f7f1a9206deab2d4d9544156e83e 100644 --- a/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts +++ b/src/vs/workbench/services/files/test/electron-browser/fileService.test.ts @@ -7,7 +7,7 @@ import * as fs from 'fs'; import * as path from 'vs/base/common/path'; import * as os from 'os'; import * as assert from 'assert'; -import { FileService } from 'vs/workbench/services/files/electron-browser/fileService'; +import { FileService } from 'vs/workbench/services/files/node/fileService'; import { FileOperation, FileOperationEvent, FileChangesEvent, FileOperationResult, FileOperationError } from 'vs/platform/files/common/files'; import { URI as uri } from 'vs/base/common/uri'; import * as uuid from 'vs/base/common/uuid'; @@ -20,7 +20,7 @@ import { TestNotificationService } from 'vs/platform/notification/test/common/te import { Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { TextModel } from 'vs/editor/common/model/textModel'; -import { IEncodingOverride } from 'vs/workbench/services/files/electron-browser/encoding'; +import { IEncodingOverride } from 'vs/workbench/services/files/node/encoding'; import { getPathFromAmdModule } from 'vs/base/common/amd'; suite('FileService', () => { diff --git a/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts b/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts index 57f7692827ff483f701d5e3c56a9e58bc8b11c3f..39e784673976dbed6202a3d529f9d8baeea7e1ed 100644 --- a/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts +++ b/src/vs/workbench/services/files/test/electron-browser/resolver.test.ts @@ -7,7 +7,7 @@ import * as fs from 'fs'; import * as path from 'vs/base/common/path'; import * as assert from 'assert'; -import { StatResolver } from 'vs/workbench/services/files/electron-browser/fileService'; +import { StatResolver } from 'vs/workbench/services/files/node/fileService'; import { URI as uri } from 'vs/base/common/uri'; import { isLinux } from 'vs/base/common/platform'; import * as utils from 'vs/workbench/services/files/test/electron-browser/utils'; diff --git a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts index eee5ac589405bfab0959889af1c4ad656f1d521a..c1fdff724cc6d761c73bd915b01431cfa9b28424 100644 --- a/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts +++ b/src/vs/workbench/services/keybinding/test/electron-browser/keybindingEditing.test.ts @@ -38,7 +38,7 @@ import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtil import { IWorkspaceContextService, Workspace, toWorkspaceFolders } from 'vs/platform/workspace/common/workspace'; import { IBackupFileService } from 'vs/workbench/services/backup/common/backup'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { FileService } from 'vs/workbench/services/files/electron-browser/fileService'; +import { FileService } from 'vs/workbench/services/files/node/fileService'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { IHashService } from 'vs/workbench/services/hash/common/hashService'; import { KeybindingsEditingService } from 'vs/workbench/services/keybinding/common/keybindingEditing';