merge again with main

src/intellisense/logReplayService.node.ts

@@ -12,7 +12,7 @@ import { ICommandManager, IApplicationShell } from '../platform/common/applicati
 import { PYTHON_LANGUAGE, NOTEBOOK_SELECTOR } from '../platform/common/constants';
 import { ContextKey } from '../platform/common/contextKey';
 import { traceInfo } from '../platform/logging';
-import { IFileSystem } from '../platform/common/platform/types.node';
+import { IFileSystem } from '../platform/common/platform/types';
 import { IDisposableRegistry, IConfigurationService } from '../platform/common/types';
 import { Commands, EditorContexts } from '../webviews/webview-side/common/constants';
 import { sleep, waitForCondition } from '../platform/common/utils/async';

src/interactive-window/interactiveWindow.node.ts

@@ -32,7 +32,7 @@ import {
 import { Commands, defaultNotebookFormat, MARKDOWN_LANGUAGE, PYTHON_LANGUAGE } from '../platform/common/constants';
 import '../platform/common/extensions';
 import { traceInfoIfCI } from '../platform/logging';
-import { IFileSystem } from '../platform/common/platform/types.node';
+import { IFileSystem } from '../platform/common/platform/types';
 import * as uuid from 'uuid/v4';
 
 import { IConfigurationService, InteractiveWindowMode, Resource } from '../platform/common/types';

src/interactive-window/interactiveWindowCommandListener.node.ts

@@ -24,7 +24,7 @@ import {
 } from '../platform/common/application/types';
 import { Commands, JVSC_EXTENSION_ID, PYTHON_LANGUAGE, Telemetry } from '../platform/common/constants';
 import { traceError, traceInfo } from '../platform/logging';
-import { IFileSystem } from '../platform/common/platform/types.node';
+import { IFileSystem } from '../platform/common/platform/types';
 import { IConfigurationService, IDataScienceCommandListener, IDisposableRegistry } from '../platform/common/types';
 import * as localize from '../platform/common/utils/localize';
 import { captureTelemetry } from '../telemetry';

src/interactive-window/interactiveWindowProvider.node.ts

@@ -12,7 +12,7 @@ import {
     IWorkspaceService
 } from '../platform/common/application/types';
 import { traceInfo } from '../platform/logging';
-import { IFileSystem } from '../platform/common/platform/types.node';
+import { IFileSystem } from '../platform/common/platform/types';
 
 import {
     GLOBAL_MEMENTO,

src/kernels/jupyter/launcher/jupyterConnection.node.ts

@@ -9,7 +9,7 @@ import { CancellationError, CancellationToken, Disposable, Event, EventEmitter,
 import { IConfigurationService, IDisposable } from '../../../platform/common/types';
 import { Cancellation } from '../../../platform/common/cancellation';
 import { traceInfo, traceError, traceWarning } from '../../../platform/logging';
-import { IFileSystem } from '../../../platform/common/platform/types.node';
+import { IFileSystem } from '../../../platform/common/platform/types';
 import { ObservableExecutionResult, Output } from '../../../platform/common/process/types.node';
 import { Deferred, createDeferred } from '../../../platform/common/utils/async';
 import { DataScience } from '../../../platform/common/utils/localize';

src/kernels/variables/variableScriptLoader.node.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 'use strict';
 import * as path from '../../platform/vscode-path/path';
-import { IFileSystem } from '../../platform/common/platform/types.node';
+import { IFileSystem } from '../../platform/common/platform/types';
 import { EXTENSION_ROOT_DIR } from '../../platform/constants.node';
 import { IJupyterVariable } from './types';
 

src/notebooks/outputs/errorRendererComms.node.ts

@@ -11,7 +11,7 @@ import {
     IVSCodeNotebook
 } from '../../platform/common/application/types';
 import { arePathsSame } from '../../platform/common/platform/fileUtils.node';
-import { IFileSystem } from '../../platform/common/platform/types.node';
+import { IFileSystem } from '../../platform/common/platform/types';
 import { IDisposableRegistry } from '../../platform/common/types';
 import { InteractiveWindowMessages } from '../../platform/messageTypes';
 import { linkCommandAllowList, LineQueryRegex } from './linkProvider.node';

src/platform/common/platform/types.node.ts

@@ -4,7 +4,6 @@
 import * as fs from 'fs';
 import * as vscode from 'vscode';
 import { IFileSystem, TemporaryFile } from './types';
-export { IFileSystem } from './types';
 
 //===========================
 // filesystem operations

src/platform/common/variables/environment.node.ts

@@ -7,7 +7,7 @@ import { sendTelemetryEvent } from '../../../telemetry';
 import { EventName } from '../../../telemetry/constants';
 import { traceError } from '../../logging';
 import { isFileNotFoundError } from '../platform/errors.node';
-import { IFileSystem } from '../platform/types.node';
+import { IFileSystem } from '../platform/types';
 import { EnvironmentVariables, IEnvironmentVariablesService } from './types';
 
 @injectable()

src/platform/logging/gitHubIssueCommandListener.node.ts

@@ -18,7 +18,7 @@ import { IApplicationEnvironment, IApplicationShell, ICommandManager } from '../
 import { Commands, MARKDOWN_LANGUAGE } from '../common/constants';
 import { traceError } from '../logging';
 import { IPlatformService } from '../common/platform/types';
-import { IFileSystem } from '../common/platform/types.node';
+import { IFileSystem } from '../common/platform/types';
 import { IDataScienceCommandListener, IDisposableRegistry, IExtensionContext } from '../common/types';
 import { GitHubIssue } from '../common/utils/localize';
 import { IInterpreterService } from '../interpreter/contracts';

src/platform/serviceRegistry.node.ts

@@ -59,7 +59,8 @@ import { ApplicationShell } from './common/application/applicationShell';
 import { CommandManager } from './common/application/commandManager';
 import { ICommandManager, IWorkspaceService, IApplicationShell } from './common/application/types';
 import { ConfigurationService } from './common/configuration/service.node';
-import { IFileSystem, IFileSystemNode } from './common/platform/types.node';
+import { IFileSystem } from './common/platform/types';
+import { IFileSystemNode } from './common/platform/types.node';
 import { FileSystem } from './common/platform/fileSystem.node';
 import { WorkspaceService } from './common/application/workspace.node';
 import { ExtensionSideRenderer, IExtensionSideRenderer } from '../webviews/extension-side/renderer';

src/test/common/variables/kernelEnvVarsService.unit.test.ts

@@ -8,7 +8,7 @@
 import { assert, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import * as path from '../../../platform/vscode-path/path';
-import { IFileSystem } from '../../../platform/common/platform/types.node';
+import { IFileSystem } from '../../../platform/common/platform/types';
 import { EnvironmentVariablesService } from '../../../platform/common/variables/environment.node';
 import { IEnvironmentVariablesProvider } from '../../../platform/common/variables/types';
 import { IEnvironmentActivationService } from '../../../platform/interpreter/activation/types';

src/test/datascience/editor-integration/codelensprovider.unit.test.ts

@@ -12,7 +12,7 @@ import {
     IVSCodeNotebook,
     IWorkspaceService
 } from '../../../platform/common/application/types';
-import { IFileSystem } from '../../../platform/common/platform/types.node';
+import { IFileSystem } from '../../../platform/common/platform/types';
 import { IConfigurationService, IWatchableJupyterSettings } from '../../../platform/common/types';
 import { DataScienceCodeLensProvider } from '../../../interactive-window/editor-integration/codelensprovider';
 import { IServiceContainer } from '../../../platform/ioc/types';

src/test/datascience/editor-integration/codewatcher.unit.test.ts

@@ -25,7 +25,7 @@ import {
     IVSCodeNotebook,
     IWorkspaceService
 } from '../../../platform/common/application/types';
-import { IFileSystem } from '../../../platform/common/platform/types.node';
+import { IFileSystem } from '../../../platform/common/platform/types';
 import { IConfigurationService } from '../../../platform/common/types';
 import { CodeLensFactory } from '../../../interactive-window/editor-integration/codeLensFactory';
 import { DataScienceCodeLensProvider } from '../../../interactive-window/editor-integration/codelensprovider';

src/test/datascience/execution.unit.test.ts

@@ -18,7 +18,7 @@ import { WorkspaceService } from '../../platform/common/application/workspace.no
 import { ConfigurationService } from '../../platform/common/configuration/service.node';
 import { PersistentState, PersistentStateFactory } from '../../platform/common/persistentState';
 import { FileSystem } from '../../platform/common/platform/fileSystem.node';
-import { IFileSystem } from '../../platform/common/platform/types.node';
+import { IFileSystem } from '../../platform/common/platform/types';
 import { ProcessServiceFactory } from '../../platform/common/process/processFactory.node';
 import { PythonExecutionFactory } from '../../platform/common/process/pythonExecutionFactory.node';
 import {

src/test/datascience/export/exportFileOpener.unit.test.ts

@@ -6,7 +6,7 @@
 import { anything, instance, mock, verify, when } from 'ts-mockito';
 import { TextEditor, Uri } from 'vscode';
 import { IApplicationShell, IDocumentManager } from '../../../platform/common/application/types';
-import { IFileSystem } from '../../../platform/common/platform/types.node';
+import { IFileSystem } from '../../../platform/common/platform/types';
 import { IBrowserService, IDisposable } from '../../../platform/common/types';
 import { ExportFileOpener } from '../../../platform/export/exportFileOpener';
 import { ExportFormat } from '../../../platform/export/types';

src/test/datascience/interpreters/environmentActivationService.vscode.test.ts

@@ -32,7 +32,7 @@ import { IS_CONDA_TEST, IS_REMOTE_NATIVE_TEST } from '../../constants.node';
 import { Disposable, Memento } from 'vscode';
 import { instance, mock, verify } from 'ts-mockito';
 import { defaultNotebookTestTimeout } from '../notebook/helper.node';
-import { IFileSystem } from '../../../platform/common/platform/types.node';
+import { IFileSystem } from '../../../platform/common/platform/types';
 /* eslint-disable @typescript-eslint/no-explicit-any, no-invalid-this */
 suite('DataScience - VSCode Notebook - (Conda Execution) (slow)', function () {
     let api: IExtensionTestApi;

src/test/datascience/jupyter/jupyterConnection.unit.test.ts

@@ -9,7 +9,7 @@ import { CancellationToken, Uri } from 'vscode';
 import { JupyterSettings } from '../../../platform/common/configSettings';
 import { ConfigurationService } from '../../../platform/common/configuration/service.node';
 import { FileSystem } from '../../../platform/common/platform/fileSystem.node';
-import { IFileSystem } from '../../../platform/common/platform/types.node';
+import { IFileSystem } from '../../../platform/common/platform/types';
 import { ObservableExecutionResult, Output } from '../../../platform/common/process/types.node';
 import { IConfigurationService, IJupyterSettings } from '../../../platform/common/types';
 import { DataScience } from '../../../platform/common/utils/localize';

src/webviews/extension-side/codeCssGenerator.node.ts

@@ -7,7 +7,7 @@ import { parse } from 'jsonc-parser';
 import * as path from '../../platform/vscode-path/path';
 import { IWorkspaceService } from '../../platform/common/application/types';
 import { traceInfo, traceError, traceWarning } from '../../platform/logging';
-import { IFileSystem } from '../../platform/common/platform/types.node';
+import { IFileSystem } from '../../platform/common/platform/types';
 import { IConfigurationService, Resource } from '../../platform/common/types';
 import { DefaultTheme } from '../webview-side/common/constants';
 import { ICodeCssGenerator, IThemeFinder } from './types';