From 923275a8017f1b9756aa0310038479f516ffd937 Mon Sep 17 00:00:00 2001 From: Peng Lyu Date: Wed, 22 Jun 2022 19:02:41 -0700 Subject: [PATCH] Eslint rule for platform (#10544) * update for types * move constants into platform * eslint rule enforced for platform --- .eslintrc.js | 11 +- src/commands.ts | 2 +- src/extension.node.ts | 9 +- src/extension.web.ts | 9 +- src/intellisense/logReplayService.node.ts | 3 +- src/interactive-window/interactiveWindow.ts | 2 +- src/kernels/helpers.ts | 2 +- .../ipywidgets/commonMessageCoordinator.ts | 2 +- .../ipywidgets/ipyWidgetMessageDispatcher.ts | 2 +- .../ipyWidgetMessageDispatcherFactory.ts | 2 +- .../ipywidgets/ipyWidgetScriptSource.ts | 2 +- src/kernels/ipywidgets/types.ts | 2 +- src/{platform => }/messageTypes.ts | 14 +- .../controllers/vscodeNotebookController.ts | 2 +- src/notebooks/outputs/errorRendererComms.ts | 2 +- src/platform/common/constants.ts | 586 +++++++++++++++++- src/platform/webviews/webviewHost.ts | 2 +- ...DataViewerPythonInterpreter.vscode.test.ts | 2 +- .../notebook/executionService.vscode.test.ts | 2 +- .../notebook/ipywidget.vscode.common.test.ts | 2 +- .../common/scriptManager.unit.test.ts | 2 +- .../extension-side/dataviewer/dataViewer.ts | 3 +- .../dataviewer/dataViewerCommandRegistry.ts | 2 +- .../dataViewerDependencyService.node.ts | 3 +- .../dataviewer/dataViewerFactory.ts | 2 +- .../extension-side/dataviewer/types.ts | 2 +- .../plotting/plotViewerProvider.node.ts | 3 +- src/webviews/extension-side/plotting/types.ts | 2 +- .../extension-side/variablesView/types.ts | 7 +- .../variablesView/variableView.ts | 5 +- src/webviews/webview-side/common/constants.ts | 581 ----------------- .../webview-side/data-explorer/mainPanel.tsx | 2 +- .../interactive-common/redux/helpers.ts | 6 +- .../interactive-common/redux/postOffice.ts | 2 +- .../redux/reducers/commonEffects.ts | 2 +- .../redux/reducers/transfer.ts | 2 +- .../redux/reducers/types.ts | 4 +- .../redux/reducers/variables.ts | 2 +- .../interactive-common/redux/store.ts | 2 +- .../interactive-common/variableExplorer.tsx | 2 +- .../webview-side/ipywidgets/common/kernel.ts | 2 +- .../webview-side/ipywidgets/common/manager.ts | 6 +- .../ipywidgets/common/scriptManager.ts | 2 +- .../webview-side/ipywidgets/common/types.ts | 2 +- .../webview-side/ipywidgets/kernel/index.ts | 6 +- .../ipywidgets/webViews/container.tsx | 2 +- src/webviews/webview-side/plot/mainPanel.tsx | 4 +- .../variable-view/redux/actions.ts | 2 +- .../variable-view/redux/mapping.ts | 2 +- .../variable-view/redux/reducers/index.ts | 2 +- {typings => types}/dom.fix.rx.compiler.d.ts | 0 {typings => types}/extensions.d.ts | 0 {typings => types}/index.d.ts | 0 53 files changed, 655 insertions(+), 671 deletions(-) rename src/{platform => }/messageTypes.ts (97%) rename {typings => types}/dom.fix.rx.compiler.d.ts (100%) rename {typings => types}/extensions.d.ts (100%) rename {typings => types}/index.d.ts (100%) diff --git a/.eslintrc.js b/.eslintrc.js index b58f5cff980..d22514a7b6f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -318,10 +318,6 @@ module.exports = { { target: './src/**[!test,standalone,webviews]**/**/*.ts', from: './src/webviews/**/*.ts', - except: [ - '**/src/webviews/webview-side/common/constants.ts', - '**/src/webviews/types', - ], message: 'Importing modules from ./src/webviews into core components (platform, kernels, notebooks, interactive-window) is not allowed.' }, { @@ -332,7 +328,12 @@ module.exports = { { target: './src/telemetry/**/**[!types]**.ts', from: './src/**[!telemetry,platform]**/**/*.ts', - message: 'Importing non-platform modules into telemetry files is not allowed.' + message: 'Importing non-telemetry modules into telemetry files is not allowed.' + }, + { + target: './src/platform/**/*.ts', + from: './src/**[!platform]**/**/*.ts', + message: 'Importing non-platform modules into platform files is not allowed.' } ] } diff --git a/src/commands.ts b/src/commands.ts index e2998f3a711..e9e74a049cc 100644 --- a/src/commands.ts +++ b/src/commands.ts @@ -13,7 +13,7 @@ import { Uri, ViewColumn } from 'vscode'; -import { IShowDataViewerFromVariablePanel } from './platform/messageTypes'; +import { IShowDataViewerFromVariablePanel } from './messageTypes'; import { Commands as DSCommands } from './platform/common/constants'; import { PythonEnvironment } from './platform/pythonEnvironments/info'; import { CommandSource } from './platform/testing/common/constants'; diff --git a/src/extension.node.ts b/src/extension.node.ts index f0fabb804e1..313547cc466 100644 --- a/src/extension.node.ts +++ b/src/extension.node.ts @@ -65,7 +65,6 @@ import { Common, OutputChannelNames } from './platform/common/utils/localize'; import { IServiceContainer, IServiceManager } from './platform/ioc/types'; import { sendErrorTelemetry, sendStartupTelemetry } from './platform/telemetry/startupTelemetry'; import { noop } from './platform/common/utils/misc'; -import { PythonExtension } from './webviews/webview-side/common/constants'; import { registerTypes as registerPlatformTypes } from './platform/serviceRegistry.node'; import { registerTypes as registerKernelTypes } from './kernels/serviceRegistry.node'; import { registerTypes as registerNotebookTypes } from './notebooks/serviceRegistry.node'; @@ -75,7 +74,13 @@ import { registerTypes as registerTelemetryTypes } from './platform/telemetry/se import { registerTypes as registerIntellisenseTypes } from './intellisense/serviceRegistry.node'; import { registerTypes as registerWebviewTypes } from './webviews/extension-side/serviceRegistry.node'; import { IExtensionActivationManager } from './platform/activation/types'; -import { isCI, isTestExecution, JUPYTER_OUTPUT_CHANNEL, STANDARD_OUTPUT_CHANNEL } from './platform/common/constants'; +import { + isCI, + isTestExecution, + JUPYTER_OUTPUT_CHANNEL, + PythonExtension, + STANDARD_OUTPUT_CHANNEL +} from './platform/common/constants'; import { getDisplayPath } from './platform/common/platform/fs-paths'; import { IFileSystemNode } from './platform/common/platform/types.node'; import { getJupyterOutputChannel } from './standalone/devTools/jupyterOutputChannel'; diff --git a/src/extension.web.ts b/src/extension.web.ts index 9903fa4376c..87219bf0f9d 100644 --- a/src/extension.web.ts +++ b/src/extension.web.ts @@ -62,7 +62,6 @@ import { Common, OutputChannelNames } from './platform/common/utils/localize'; import { IServiceContainer, IServiceManager } from './platform/ioc/types'; import { sendErrorTelemetry, sendStartupTelemetry } from './platform/telemetry/startupTelemetry'; import { noop } from './platform/common/utils/misc'; -import { PythonExtension } from './webviews/webview-side/common/constants'; import { registerTypes as registerPlatformTypes } from './platform/serviceRegistry.web'; import { registerTypes as registerTelemetryTypes } from './platform/telemetry/serviceRegistry.web'; import { registerTypes as registerKernelTypes } from './kernels/serviceRegistry.web'; @@ -73,7 +72,13 @@ import { registerTypes as registerTerminalTypes } from './platform/terminals/ser import { registerTypes as registerStandaloneTypes } from './standalone/serviceRegistry.web'; import { registerTypes as registerWebviewTypes } from './webviews/extension-side/serviceRegistry.web'; import { IExtensionActivationManager } from './platform/activation/types'; -import { isCI, isTestExecution, JUPYTER_OUTPUT_CHANNEL, STANDARD_OUTPUT_CHANNEL } from './platform/common/constants'; +import { + isCI, + isTestExecution, + JUPYTER_OUTPUT_CHANNEL, + PythonExtension, + STANDARD_OUTPUT_CHANNEL +} from './platform/common/constants'; import { getJupyterOutputChannel } from './standalone/devTools/jupyterOutputChannel'; import { registerLogger, setLoggingLevel } from './platform/logging'; import { Container } from 'inversify/lib/container/container'; diff --git a/src/intellisense/logReplayService.node.ts b/src/intellisense/logReplayService.node.ts index 1fc2bffdd26..f6a17293edd 100644 --- a/src/intellisense/logReplayService.node.ts +++ b/src/intellisense/logReplayService.node.ts @@ -9,12 +9,11 @@ import * as lspConcat from '@vscode/lsp-notebook-concat'; import * as protocol from 'vscode-languageserver-protocol'; import { IExtensionSingleActivationService } from '../platform/activation/types'; import { ICommandManager, IApplicationShell } from '../platform/common/application/types'; -import { PYTHON_LANGUAGE, NOTEBOOK_SELECTOR } from '../platform/common/constants'; +import { PYTHON_LANGUAGE, NOTEBOOK_SELECTOR, Commands, EditorContexts } from '../platform/common/constants'; import { ContextKey } from '../platform/common/contextKey'; import { traceInfo } from '../platform/logging'; import { IFileSystemNode } from '../platform/common/platform/types.node'; import { IDisposableRegistry, IConfigurationService } from '../platform/common/types'; -import { Commands, EditorContexts } from '../webviews/webview-side/common/constants'; import { sleep, waitForCondition } from '../platform/common/utils/async'; import { noop, swallowExceptions } from '../platform/common/utils/misc'; diff --git a/src/interactive-window/interactiveWindow.ts b/src/interactive-window/interactiveWindow.ts index 834077d8a8d..9d0392fddfa 100644 --- a/src/interactive-window/interactiveWindow.ts +++ b/src/interactive-window/interactiveWindow.ts @@ -47,7 +47,7 @@ import { InteractiveCellResultError } from '../platform/errors/interactiveCellRe import { DataScience } from '../platform/common/utils/localize'; import { createDeferred, Deferred } from '../platform/common/utils/async'; import { IServiceContainer } from '../platform/ioc/types'; -import { SysInfoReason } from '../platform/messageTypes'; +import { SysInfoReason } from '../messageTypes'; import { createOutputWithErrorMessageForDisplay } from '../platform/errors/errorUtils'; import { INotebookExporter } from '../kernels/jupyter/types'; import { IExportDialog, ExportFormat } from '../notebooks/export/types'; diff --git a/src/kernels/helpers.ts b/src/kernels/helpers.ts index 6092b20dcbe..716408afc89 100644 --- a/src/kernels/helpers.ts +++ b/src/kernels/helpers.ts @@ -25,7 +25,7 @@ import { isCI, PYTHON_LANGUAGE, Telemetry } from '../platform/common/constants'; import { traceError, traceInfo, traceInfoIfCI, traceWarning } from '../platform/logging'; import { getDisplayPath, getFilePath } from '../platform/common/platform/fs-paths'; import { DataScience } from '../platform/common/utils/localize'; -import { SysInfoReason } from '../platform/messageTypes'; +import { SysInfoReason } from '../messageTypes'; import { getNormalizedInterpreterPath, getInterpreterHash } from '../platform/pythonEnvironments/info/interpreter'; import { getTelemetrySafeVersion } from '../platform/telemetry/helpers'; import { EnvironmentType, PythonEnvironment } from '../platform/pythonEnvironments/info'; diff --git a/src/kernels/ipywidgets/commonMessageCoordinator.ts b/src/kernels/ipywidgets/commonMessageCoordinator.ts index 6589df793d5..780f51b0846 100644 --- a/src/kernels/ipywidgets/commonMessageCoordinator.ts +++ b/src/kernels/ipywidgets/commonMessageCoordinator.ts @@ -18,7 +18,7 @@ import { IPyWidgetMessages, LoadIPyWidgetClassLoadAction, NotifyIPyWidgetWidgetVersionNotSupportedAction -} from '../../platform/messageTypes'; +} from '../../messageTypes'; import { IServiceContainer } from '../../platform/ioc/types'; import { sendTelemetryEvent, Telemetry } from '../../telemetry'; import { getTelemetrySafeHashedString } from '../../platform/telemetry/helpers'; diff --git a/src/kernels/ipywidgets/ipyWidgetMessageDispatcher.ts b/src/kernels/ipywidgets/ipyWidgetMessageDispatcher.ts index 5497d1904e8..26b45e09b4b 100644 --- a/src/kernels/ipywidgets/ipyWidgetMessageDispatcher.ts +++ b/src/kernels/ipywidgets/ipyWidgetMessageDispatcher.ts @@ -13,7 +13,7 @@ import { IDisposable } from '../../platform/common/types'; import { Deferred, createDeferred } from '../../platform/common/utils/async'; import { noop } from '../../platform/common/utils/misc'; import { deserializeDataViews, serializeDataViews } from '../../platform/common/utils/serializers'; -import { IPyWidgetMessages, IInteractiveWindowMapping } from '../../platform/messageTypes'; +import { IPyWidgetMessages, IInteractiveWindowMapping } from '../../messageTypes'; import { sendTelemetryEvent, Telemetry } from '../../telemetry'; import { IKernel, IKernelProvider, KernelSocketInformation } from '../types'; import { WIDGET_MIMETYPE } from './constants'; diff --git a/src/kernels/ipywidgets/ipyWidgetMessageDispatcherFactory.ts b/src/kernels/ipywidgets/ipyWidgetMessageDispatcherFactory.ts index 7b3750cc056..b59819d213b 100644 --- a/src/kernels/ipywidgets/ipyWidgetMessageDispatcherFactory.ts +++ b/src/kernels/ipywidgets/ipyWidgetMessageDispatcherFactory.ts @@ -6,7 +6,7 @@ import { inject, injectable } from 'inversify'; import { Event, EventEmitter, NotebookDocument } from 'vscode'; import { IDisposable, IDisposableRegistry } from '../../platform/common/types'; -import { IPyWidgetMessages } from '../../platform/messageTypes'; +import { IPyWidgetMessages } from '../../messageTypes'; import { getAssociatedNotebookDocument } from '../helpers'; import { IKernel, IKernelProvider } from '../types'; import { IPyWidgetMessageDispatcher } from './ipyWidgetMessageDispatcher'; diff --git a/src/kernels/ipywidgets/ipyWidgetScriptSource.ts b/src/kernels/ipywidgets/ipyWidgetScriptSource.ts index 842c6c2e636..643e6849fdb 100644 --- a/src/kernels/ipywidgets/ipyWidgetScriptSource.ts +++ b/src/kernels/ipywidgets/ipyWidgetScriptSource.ts @@ -6,7 +6,7 @@ import type * as jupyterlabService from '@jupyterlab/services'; import { Event, EventEmitter, NotebookDocument, Uri } from 'vscode'; import { traceError, traceInfo, traceVerbose, traceWarning } from '../../platform/logging'; import { IDisposableRegistry, IConfigurationService, IHttpClient, IDisposable } from '../../platform/common/types'; -import { InteractiveWindowMessages, IPyWidgetMessages } from '../../platform/messageTypes'; +import { InteractiveWindowMessages, IPyWidgetMessages } from '../../messageTypes'; import { sendTelemetryEvent, Telemetry } from '../../telemetry'; import { IKernel, IKernelProvider } from '../types'; import { IPyWidgetScriptSourceProvider } from './ipyWidgetScriptSourceProvider'; diff --git a/src/kernels/ipywidgets/types.ts b/src/kernels/ipywidgets/types.ts index f08f6ddd2bc..9aceed9b38e 100644 --- a/src/kernels/ipywidgets/types.ts +++ b/src/kernels/ipywidgets/types.ts @@ -5,7 +5,7 @@ import { Event, Uri } from 'vscode'; import { IDisposable, IHttpClient } from '../../platform/common/types'; -import { IPyWidgetMessages } from '../../platform/messageTypes'; +import { IPyWidgetMessages } from '../../messageTypes'; import { IKernel } from '../types'; export interface IPyWidgetMessage { diff --git a/src/platform/messageTypes.ts b/src/messageTypes.ts similarity index 97% rename from src/platform/messageTypes.ts rename to src/messageTypes.ts index 470fd216082..e40b98d1956 100644 --- a/src/platform/messageTypes.ts +++ b/src/messageTypes.ts @@ -3,18 +3,18 @@ 'use strict'; import { Uri } from 'vscode'; import type { KernelMessage } from '@jupyterlab/services'; -import { NativeKeyboardCommandTelemetry, NativeMouseCommandTelemetry } from '../platform/common/constants'; +import { NativeKeyboardCommandTelemetry, NativeMouseCommandTelemetry } from './platform/common/constants'; import { IVariableExplorerHeight, CommonActionType // eslint-disable-next-line -} from '../webviews/webview-side/interactive-common/redux/reducers/types'; +} from './webviews/webview-side/interactive-common/redux/reducers/types'; // eslint-disable-next-line -import { BaseReduxActionPayload } from '../webviews/types'; -import { WidgetScriptSource } from '../kernels/ipywidgets/types'; -import { KernelConnectionMetadata, KernelSocketOptions } from '../kernels/types'; -import { ICell } from './common/types'; -import { IJupyterVariable, IJupyterVariablesRequest, IJupyterVariablesResponse } from '../kernels/variables/types'; +import { BaseReduxActionPayload } from './webviews/types'; +import { WidgetScriptSource } from './kernels/ipywidgets/types'; +import { KernelConnectionMetadata, KernelSocketOptions } from './kernels/types'; +import { ICell } from './platform/common/types'; +import { IJupyterVariable, IJupyterVariablesRequest, IJupyterVariablesResponse } from './kernels/variables/types'; export type NotifyIPyWidgetWidgetVersionNotSupportedAction = { moduleName: 'qgrid'; diff --git a/src/notebooks/controllers/vscodeNotebookController.ts b/src/notebooks/controllers/vscodeNotebookController.ts index af0cad085c8..3fc6b6e5322 100644 --- a/src/notebooks/controllers/vscodeNotebookController.ts +++ b/src/notebooks/controllers/vscodeNotebookController.ts @@ -55,7 +55,7 @@ import { EnvironmentType } from '../../platform/pythonEnvironments/info'; import { Commands } from '../../platform/common/constants'; import { Telemetry } from '../../telemetry'; import { WrappedError } from '../../platform/errors/types'; -import { IPyWidgetMessages } from '../../platform/messageTypes'; +import { IPyWidgetMessages } from '../../messageTypes'; import { getKernelConnectionPath, getRemoteKernelSessionInformation, diff --git a/src/notebooks/outputs/errorRendererComms.ts b/src/notebooks/outputs/errorRendererComms.ts index db532968fd3..822105bec91 100644 --- a/src/notebooks/outputs/errorRendererComms.ts +++ b/src/notebooks/outputs/errorRendererComms.ts @@ -23,7 +23,7 @@ import { } from '../../platform/common/application/types'; import { IFileSystem } from '../../platform/common/platform/types'; import { IDisposableRegistry } from '../../platform/common/types'; -import { InteractiveWindowMessages } from '../../platform/messageTypes'; +import { InteractiveWindowMessages } from '../../messageTypes'; import { linkCommandAllowList, LineQueryRegex } from './linkProvider'; @injectable() diff --git a/src/platform/common/constants.ts b/src/platform/common/constants.ts index 8a70550dcfa..27beba97d0a 100644 --- a/src/platform/common/constants.ts +++ b/src/platform/common/constants.ts @@ -32,11 +32,6 @@ export const STANDARD_OUTPUT_CHANNEL = 'STANDARD_OUTPUT_CHANNEL'; export * from '../constants'; -/** - * TODO@rebornix, move webviews/webview-side/common/constants to right places - */ -export * from '../../webviews/webview-side/common/constants'; - export namespace HelpLinks { export const PythonInteractiveHelpLink = 'https://aka.ms/pyaiinstall'; export const JupyterDataRateHelpLink = 'https://aka.ms/AA5ggm0'; // This redirects here: https://jupyter-notebook.readthedocs.io/en/stable/config.html @@ -126,3 +121,584 @@ export namespace CodeSnippets { export const JUPYTER_OUTPUT_CHANNEL = 'JUPYTER_OUTPUT_CHANNEL'; export const KernelInterruptDaemonModule = 'vscode_datascience_helpers.kernel_interrupt_daemon'; export const JupyterDaemonModule = 'vscode_datascience_helpers.jupyter_daemon'; + +export const DefaultTheme = 'Default Light+'; + +// Python Module to be used when instantiating the Python Daemon. + +export const PythonExtension = 'ms-python.python'; +export const PylanceExtension = 'ms-python.vscode-pylance'; + +export const LanguagesSupportedByPythonkernel = [ + 'python', + 'html', // %%html + 'xml', // %%svg as svg is same as `xml` + 'javascript', // %%javascript, %%js + 'markdown', // %%markdown, %%latex + 'latex', // %%latex (some extensions register such languages) + 'shellscript', // %%script, %%bash, %%sh + 'bat', // %%script, %%bash, %%sh + 'powershell', // %%script powershell, %%script pwsh + 'kusto', // %%kqlmagic + 'ruby', // %%ruby + 'sql', // %%sql + 'perl', // %%perl + 'raw' // raw cells (no formatting) +]; + +// List of 'language' names that we know about. All should be lower case as that's how we compare. +export const KnownKernelLanguageAliases = new Map([ + ['qsharp', 'q#'], + ['csharp', 'c#'], + ['fsharp', 'f#'], + ['c++11', 'c++'], + ['c++12', 'c++'], + ['c++14', 'c++'] +]); +export const jupyterLanguageToMonacoLanguageMapping = new Map([ + ['bash', 'shellscript'], + ['c#', 'csharp'], + ['f#', 'fsharp'], + ['q#', 'qsharp'], + ['c++11', 'c++'], + ['c++12', 'c++'], + ['c++14', 'c++'] +]); +/** + * This will get updated with the list of VS Code languages. + * This way, we can send those via telemetry, instead of having to hardcode the languages. + */ +export const VSCodeKnownNotebookLanguages: string[] = [ + 'python', + 'r', + 'julia', + 'c++', + 'c#', + 'f#', + 'q#', + 'powershell', + 'java', + 'scala', + 'haskell', + 'bash', + 'cling', + 'rust', + 'sas', + 'sos', + 'ocaml' +]; + +export namespace Commands { + export const RunAllCells = 'jupyter.runallcells'; + export const RunAllCellsAbove = 'jupyter.runallcellsabove'; + export const RunCellAndAllBelow = 'jupyter.runcellandallbelow'; + export const RunAllCellsAbovePalette = 'jupyter.runallcellsabove.palette'; + export const RunCellAndAllBelowPalette = 'jupyter.runcurrentcellandallbelow.palette'; + export const RunToLine = 'jupyter.runtoline'; + export const RunFromLine = 'jupyter.runfromline'; + export const RunCell = 'jupyter.runcell'; + export const RunCurrentCell = 'jupyter.runcurrentcell'; + export const RunCurrentCellAdvance = 'jupyter.runcurrentcelladvance'; + export const CreateNewInteractive = 'jupyter.createnewinteractive'; + export const ImportNotebook = 'jupyter.importnotebook'; + export const ImportNotebookFile = 'jupyter.importnotebookfile'; + export const SelectJupyterURI = 'jupyter.selectjupyteruri'; + export const SelectNativeJupyterUriFromToolBar = 'jupyter.selectNativeJupyterUriFromToolBar'; + export const SelectJupyterCommandLine = 'jupyter.selectjupytercommandline'; + export const ExportFileAsNotebook = 'jupyter.exportfileasnotebook'; + export const ExportFileAndOutputAsNotebook = 'jupyter.exportfileandoutputasnotebook'; + export const InterruptKernel = 'jupyter.interruptkernel'; + export const RestartKernel = 'jupyter.restartkernel'; + export const NotebookEditorUndoCells = 'jupyter.notebookeditor.undocells'; + export const NotebookEditorRedoCells = 'jupyter.notebookeditor.redocells'; + export const NotebookEditorRemoveAllCells = 'jupyter.notebookeditor.removeallcells'; + export const NotebookEditorInterruptKernel = 'jupyter.notebookeditor.interruptkernel'; + export const NotebookEditorRestartKernel = 'jupyter.notebookeditor.restartkernel'; + export const NotebookEditorRunAllCells = 'jupyter.notebookeditor.runallcells'; + export const NotebookEditorRunSelectedCell = 'jupyter.notebookeditor.runselectedcell'; + export const NotebookEditorAddCellBelow = 'jupyter.notebookeditor.addcellbelow'; + export const ExpandAllCells = 'jupyter.expandallcells'; + export const CollapseAllCells = 'jupyter.collapseallcells'; + export const ExportOutputAsNotebook = 'jupyter.exportoutputasnotebook'; + export const ExecSelectionInInteractiveWindow = 'jupyter.execSelectionInteractive'; + export const RunFileInInteractiveWindows = 'jupyter.runFileInteractive'; + export const DebugFileInInteractiveWindows = 'jupyter.debugFileInteractive'; + export const AddCellBelow = 'jupyter.addcellbelow'; + export const DebugCurrentCellPalette = 'jupyter.debugcurrentcell.palette'; + export const DebugCell = 'jupyter.debugcell'; + export const DebugStepOver = 'jupyter.debugstepover'; + export const DebugContinue = 'jupyter.debugcontinue'; + export const DebugStop = 'jupyter.debugstop'; + export const RunCurrentCellAndAddBelow = 'jupyter.runcurrentcellandaddbelow'; + export const InsertCellBelowPosition = 'jupyter.insertCellBelowPosition'; + export const InsertCellBelow = 'jupyter.insertCellBelow'; + export const InsertCellAbove = 'jupyter.insertCellAbove'; + export const DeleteCells = 'jupyter.deleteCells'; + export const SelectCell = 'jupyter.selectCell'; + export const SelectCellContents = 'jupyter.selectCellContents'; + export const ExtendSelectionByCellAbove = 'jupyter.extendSelectionByCellAbove'; + export const ExtendSelectionByCellBelow = 'jupyter.extendSelectionByCellBelow'; + export const MoveCellsUp = 'jupyter.moveCellsUp'; + export const MoveCellsDown = 'jupyter.moveCellsDown'; + export const ChangeCellToMarkdown = 'jupyter.changeCellToMarkdown'; + export const ChangeCellToCode = 'jupyter.changeCellToCode'; + export const GotoNextCellInFile = 'jupyter.gotoNextCellInFile'; + export const GotoPrevCellInFile = 'jupyter.gotoPrevCellInFile'; + export const ScrollToCell = 'jupyter.scrolltocell'; + export const CreateNewNotebook = 'jupyter.createnewnotebook'; + export const ViewJupyterOutput = 'jupyter.viewOutput'; + export const ExportAsPythonScript = 'jupyter.exportAsPythonScript'; + export const ExportToHTML = 'jupyter.exportToHTML'; + export const ExportToPDF = 'jupyter.exportToPDF'; + export const Export = 'jupyter.export'; + export const NativeNotebookExport = 'jupyter.notebookeditor.export'; + export const LatestExtension = 'jupyter.latestExtension'; + export const EnableLoadingWidgetsFrom3rdPartySource = 'jupyter.enableLoadingWidgetScriptsFromThirdPartySource'; + export const NotebookEditorExpandAllCells = 'jupyter.notebookeditor.expandallcells'; + export const NotebookEditorCollapseAllCells = 'jupyter.notebookeditor.collapseallcells'; + export const EnableDebugLogging = 'jupyter.enableDebugLogging'; + export const ResetLoggingLevel = 'jupyter.resetLoggingLevel'; + export const ShowDataViewer = 'jupyter.showDataViewer'; + export const RefreshDataViewer = 'jupyter.refreshDataViewer'; + export const ClearSavedJupyterUris = 'jupyter.clearSavedJupyterUris'; + export const OpenVariableView = 'jupyter.openVariableView'; + export const OpenOutlineView = 'jupyter.openOutlineView'; + export const InteractiveClearAll = 'jupyter.interactive.clearAllCells'; + export const InteractiveRemoveCell = 'jupyter.interactive.removeCell'; + export const InteractiveGoToCode = 'jupyter.interactive.goToCode'; + export const InteractiveCopyCell = 'jupyter.interactive.copyCell'; + export const InteractiveExportAsNotebook = 'jupyter.interactive.exportasnotebook'; + export const InteractiveExportAs = 'jupyter.interactive.exportas'; + export const DebugNotebook = 'jupyter.debugNotebook'; + export const RunByLine = 'jupyter.runByLine'; + export const RunAndDebugCell = 'jupyter.runAndDebugCell'; + export const RunByLineNext = 'jupyter.runByLineNext'; + export const RunByLineStop = 'jupyter.runByLineStop'; + export const ReplayPylanceLog = 'jupyter.replayPylanceLog'; + export const ReplayPylanceLogStep = 'jupyter.replayPylanceLogStep'; + export const InstallPythonExtensionViaKernelPicker = 'jupyter.installPythonExtensionViaKernelPicker'; + export const InstallPythonViaKernelPicker = 'jupyter.installPythonViaKernelPicker'; +} + +export namespace CodeLensCommands { + // If not specified in the options this is the default set of commands in our design time code lenses + export const DefaultDesignLenses = [Commands.RunCurrentCell, Commands.RunAllCellsAbove, Commands.DebugCell]; + // If not specified in the options this is the default set of commands in our debug time code lenses + export const DefaultDebuggingLenses = [Commands.DebugContinue, Commands.DebugStop, Commands.DebugStepOver]; + // These are the commands that are allowed at debug time + export const DebuggerCommands = [Commands.DebugContinue, Commands.DebugStop, Commands.DebugStepOver]; +} + +export namespace EditorContexts { + export const HasCodeCells = 'jupyter.hascodecells'; + export const HaveInteractiveCells = 'jupyter.haveinteractivecells'; + export const HaveRedoableCells = 'jupyter.haveredoablecells'; + export const HaveInteractive = 'jupyter.haveinteractive'; + export const IsInteractiveActive = 'jupyter.isinteractiveactive'; + export const OwnsSelection = 'jupyter.ownsSelection'; + export const HaveNativeCells = 'jupyter.havenativecells'; + export const HaveNativeRedoableCells = 'jupyter.havenativeredoablecells'; + export const HaveNative = 'jupyter.havenative'; + export const IsNativeActive = 'jupyter.isnativeactive'; + export const IsInteractiveOrNativeActive = 'jupyter.isinteractiveornativeactive'; + export const IsPythonOrNativeActive = 'jupyter.ispythonornativeactive'; + export const IsPythonOrInteractiveActive = 'jupyter.ispythonorinteractiveeactive'; + export const IsPythonOrInteractiveOrNativeActive = 'jupyter.ispythonorinteractiveornativeeactive'; + export const CanRestartNotebookKernel = 'jupyter.notebookeditor.canrestartNotebookkernel'; + export const CanInterruptNotebookKernel = 'jupyter.notebookeditor.canInterruptNotebookKernel'; + export const CanRestartInteractiveWindowKernel = 'jupyter.interactive.canRestartNotebookKernel'; + export const CanInterruptInteractiveWindowKernel = 'jupyter.interactive.canInterruptNotebookKernel'; + export const DebuggingInProgress = 'jupyter.notebookeditor.debuggingInProgress'; + export const RunByLineInProgress = 'jupyter.notebookeditor.runByLineInProgress'; + export const IsPythonNotebook = 'jupyter.ispythonnotebook'; + export const IsJupyterKernelSelected = 'jupyter.kernel.isjupyter'; + export const IsDataViewerActive = 'jupyter.dataViewerActive'; + export const HasNativeNotebookOrInteractiveWindowOpen = 'jupyter.hasNativeNotebookOrInteractiveWindowOpen'; + export const ZmqAvailable = 'jupyter.zmqavailable'; + export const ReplayLogLoaded = 'jupyter.replayLogLoaded'; +} + +export namespace RegExpValues { + export const PythonCellMarker = /^(#\s*%%|#\s*\|#\s*In\[\d*?\]|#\s*In\[ \])/; + export const PythonMarkdownCellMarker = /^(#\s*%%\s*\[markdown\]|#\s*\)/; + // This next one has to be a string because uglifyJS isn't handling the groups. We use named-js-regexp to parse it + // instead. + export const UrlPatternRegEx = + '(?https?:\\/\\/)((\\(.+\\s+or\\s+(?.+)\\))|(?[^\\s]+))(?:.+)'; + export interface IUrlPatternGroupType { + LOCAL: string | undefined; + PREFIX: string | undefined; + REST: string | undefined; + IP: string | undefined; + } + export const HttpPattern = /https?:\/\//; + export const ShapeSplitterRegEx = /.*,\s*(\d+).*/; + export const SvgHeightRegex = /(\([ - ['qsharp', 'q#'], - ['csharp', 'c#'], - ['fsharp', 'f#'], - ['c++11', 'c++'], - ['c++12', 'c++'], - ['c++14', 'c++'] -]); -export const jupyterLanguageToMonacoLanguageMapping = new Map([ - ['bash', 'shellscript'], - ['c#', 'csharp'], - ['f#', 'fsharp'], - ['q#', 'qsharp'], - ['c++11', 'c++'], - ['c++12', 'c++'], - ['c++14', 'c++'] -]); -/** - * This will get updated with the list of VS Code languages. - * This way, we can send those via telemetry, instead of having to hardcode the languages. - */ -export const VSCodeKnownNotebookLanguages: string[] = [ - 'python', - 'r', - 'julia', - 'c++', - 'c#', - 'f#', - 'q#', - 'powershell', - 'java', - 'scala', - 'haskell', - 'bash', - 'cling', - 'rust', - 'sas', - 'sos', - 'ocaml' -]; - -export namespace Commands { - export const RunAllCells = 'jupyter.runallcells'; - export const RunAllCellsAbove = 'jupyter.runallcellsabove'; - export const RunCellAndAllBelow = 'jupyter.runcellandallbelow'; - export const RunAllCellsAbovePalette = 'jupyter.runallcellsabove.palette'; - export const RunCellAndAllBelowPalette = 'jupyter.runcurrentcellandallbelow.palette'; - export const RunToLine = 'jupyter.runtoline'; - export const RunFromLine = 'jupyter.runfromline'; - export const RunCell = 'jupyter.runcell'; - export const RunCurrentCell = 'jupyter.runcurrentcell'; - export const RunCurrentCellAdvance = 'jupyter.runcurrentcelladvance'; - export const CreateNewInteractive = 'jupyter.createnewinteractive'; - export const ImportNotebook = 'jupyter.importnotebook'; - export const ImportNotebookFile = 'jupyter.importnotebookfile'; - export const SelectJupyterURI = 'jupyter.selectjupyteruri'; - export const SelectNativeJupyterUriFromToolBar = 'jupyter.selectNativeJupyterUriFromToolBar'; - export const SelectJupyterCommandLine = 'jupyter.selectjupytercommandline'; - export const ExportFileAsNotebook = 'jupyter.exportfileasnotebook'; - export const ExportFileAndOutputAsNotebook = 'jupyter.exportfileandoutputasnotebook'; - export const InterruptKernel = 'jupyter.interruptkernel'; - export const RestartKernel = 'jupyter.restartkernel'; - export const NotebookEditorUndoCells = 'jupyter.notebookeditor.undocells'; - export const NotebookEditorRedoCells = 'jupyter.notebookeditor.redocells'; - export const NotebookEditorRemoveAllCells = 'jupyter.notebookeditor.removeallcells'; - export const NotebookEditorInterruptKernel = 'jupyter.notebookeditor.interruptkernel'; - export const NotebookEditorRestartKernel = 'jupyter.notebookeditor.restartkernel'; - export const NotebookEditorRunAllCells = 'jupyter.notebookeditor.runallcells'; - export const NotebookEditorRunSelectedCell = 'jupyter.notebookeditor.runselectedcell'; - export const NotebookEditorAddCellBelow = 'jupyter.notebookeditor.addcellbelow'; - export const ExpandAllCells = 'jupyter.expandallcells'; - export const CollapseAllCells = 'jupyter.collapseallcells'; - export const ExportOutputAsNotebook = 'jupyter.exportoutputasnotebook'; - export const ExecSelectionInInteractiveWindow = 'jupyter.execSelectionInteractive'; - export const RunFileInInteractiveWindows = 'jupyter.runFileInteractive'; - export const DebugFileInInteractiveWindows = 'jupyter.debugFileInteractive'; - export const AddCellBelow = 'jupyter.addcellbelow'; - export const DebugCurrentCellPalette = 'jupyter.debugcurrentcell.palette'; - export const DebugCell = 'jupyter.debugcell'; - export const DebugStepOver = 'jupyter.debugstepover'; - export const DebugContinue = 'jupyter.debugcontinue'; - export const DebugStop = 'jupyter.debugstop'; - export const RunCurrentCellAndAddBelow = 'jupyter.runcurrentcellandaddbelow'; - export const InsertCellBelowPosition = 'jupyter.insertCellBelowPosition'; - export const InsertCellBelow = 'jupyter.insertCellBelow'; - export const InsertCellAbove = 'jupyter.insertCellAbove'; - export const DeleteCells = 'jupyter.deleteCells'; - export const SelectCell = 'jupyter.selectCell'; - export const SelectCellContents = 'jupyter.selectCellContents'; - export const ExtendSelectionByCellAbove = 'jupyter.extendSelectionByCellAbove'; - export const ExtendSelectionByCellBelow = 'jupyter.extendSelectionByCellBelow'; - export const MoveCellsUp = 'jupyter.moveCellsUp'; - export const MoveCellsDown = 'jupyter.moveCellsDown'; - export const ChangeCellToMarkdown = 'jupyter.changeCellToMarkdown'; - export const ChangeCellToCode = 'jupyter.changeCellToCode'; - export const GotoNextCellInFile = 'jupyter.gotoNextCellInFile'; - export const GotoPrevCellInFile = 'jupyter.gotoPrevCellInFile'; - export const ScrollToCell = 'jupyter.scrolltocell'; - export const CreateNewNotebook = 'jupyter.createnewnotebook'; - export const ViewJupyterOutput = 'jupyter.viewOutput'; - export const ExportAsPythonScript = 'jupyter.exportAsPythonScript'; - export const ExportToHTML = 'jupyter.exportToHTML'; - export const ExportToPDF = 'jupyter.exportToPDF'; - export const Export = 'jupyter.export'; - export const NativeNotebookExport = 'jupyter.notebookeditor.export'; - export const LatestExtension = 'jupyter.latestExtension'; - export const EnableLoadingWidgetsFrom3rdPartySource = 'jupyter.enableLoadingWidgetScriptsFromThirdPartySource'; - export const NotebookEditorExpandAllCells = 'jupyter.notebookeditor.expandallcells'; - export const NotebookEditorCollapseAllCells = 'jupyter.notebookeditor.collapseallcells'; - export const EnableDebugLogging = 'jupyter.enableDebugLogging'; - export const ResetLoggingLevel = 'jupyter.resetLoggingLevel'; - export const ShowDataViewer = 'jupyter.showDataViewer'; - export const RefreshDataViewer = 'jupyter.refreshDataViewer'; - export const ClearSavedJupyterUris = 'jupyter.clearSavedJupyterUris'; - export const OpenVariableView = 'jupyter.openVariableView'; - export const OpenOutlineView = 'jupyter.openOutlineView'; - export const InteractiveClearAll = 'jupyter.interactive.clearAllCells'; - export const InteractiveRemoveCell = 'jupyter.interactive.removeCell'; - export const InteractiveGoToCode = 'jupyter.interactive.goToCode'; - export const InteractiveCopyCell = 'jupyter.interactive.copyCell'; - export const InteractiveExportAsNotebook = 'jupyter.interactive.exportasnotebook'; - export const InteractiveExportAs = 'jupyter.interactive.exportas'; - export const DebugNotebook = 'jupyter.debugNotebook'; - export const RunByLine = 'jupyter.runByLine'; - export const RunAndDebugCell = 'jupyter.runAndDebugCell'; - export const RunByLineNext = 'jupyter.runByLineNext'; - export const RunByLineStop = 'jupyter.runByLineStop'; - export const ReplayPylanceLog = 'jupyter.replayPylanceLog'; - export const ReplayPylanceLogStep = 'jupyter.replayPylanceLogStep'; - export const InstallPythonExtensionViaKernelPicker = 'jupyter.installPythonExtensionViaKernelPicker'; - export const InstallPythonViaKernelPicker = 'jupyter.installPythonViaKernelPicker'; -} - -export namespace CodeLensCommands { - // If not specified in the options this is the default set of commands in our design time code lenses - export const DefaultDesignLenses = [Commands.RunCurrentCell, Commands.RunAllCellsAbove, Commands.DebugCell]; - // If not specified in the options this is the default set of commands in our debug time code lenses - export const DefaultDebuggingLenses = [Commands.DebugContinue, Commands.DebugStop, Commands.DebugStepOver]; - // These are the commands that are allowed at debug time - export const DebuggerCommands = [Commands.DebugContinue, Commands.DebugStop, Commands.DebugStepOver]; -} - -export namespace EditorContexts { - export const HasCodeCells = 'jupyter.hascodecells'; - export const HaveInteractiveCells = 'jupyter.haveinteractivecells'; - export const HaveRedoableCells = 'jupyter.haveredoablecells'; - export const HaveInteractive = 'jupyter.haveinteractive'; - export const IsInteractiveActive = 'jupyter.isinteractiveactive'; - export const OwnsSelection = 'jupyter.ownsSelection'; - export const HaveNativeCells = 'jupyter.havenativecells'; - export const HaveNativeRedoableCells = 'jupyter.havenativeredoablecells'; - export const HaveNative = 'jupyter.havenative'; - export const IsNativeActive = 'jupyter.isnativeactive'; - export const IsInteractiveOrNativeActive = 'jupyter.isinteractiveornativeactive'; - export const IsPythonOrNativeActive = 'jupyter.ispythonornativeactive'; - export const IsPythonOrInteractiveActive = 'jupyter.ispythonorinteractiveeactive'; - export const IsPythonOrInteractiveOrNativeActive = 'jupyter.ispythonorinteractiveornativeeactive'; - export const CanRestartNotebookKernel = 'jupyter.notebookeditor.canrestartNotebookkernel'; - export const CanInterruptNotebookKernel = 'jupyter.notebookeditor.canInterruptNotebookKernel'; - export const CanRestartInteractiveWindowKernel = 'jupyter.interactive.canRestartNotebookKernel'; - export const CanInterruptInteractiveWindowKernel = 'jupyter.interactive.canInterruptNotebookKernel'; - export const DebuggingInProgress = 'jupyter.notebookeditor.debuggingInProgress'; - export const RunByLineInProgress = 'jupyter.notebookeditor.runByLineInProgress'; - export const IsPythonNotebook = 'jupyter.ispythonnotebook'; - export const IsJupyterKernelSelected = 'jupyter.kernel.isjupyter'; - export const IsDataViewerActive = 'jupyter.dataViewerActive'; - export const HasNativeNotebookOrInteractiveWindowOpen = 'jupyter.hasNativeNotebookOrInteractiveWindowOpen'; - export const ZmqAvailable = 'jupyter.zmqavailable'; - export const ReplayLogLoaded = 'jupyter.replayLogLoaded'; -} - -export namespace RegExpValues { - export const PythonCellMarker = /^(#\s*%%|#\s*\|#\s*In\[\d*?\]|#\s*In\[ \])/; - export const PythonMarkdownCellMarker = /^(#\s*%%\s*\[markdown\]|#\s*\)/; - // This next one has to be a string because uglifyJS isn't handling the groups. We use named-js-regexp to parse it - // instead. - export const UrlPatternRegEx = - '(?https?:\\/\\/)((\\(.+\\s+or\\s+(?.+)\\))|(?[^\\s]+))(?:.+)'; - export interface IUrlPatternGroupType { - LOCAL: string | undefined; - PREFIX: string | undefined; - REST: string | undefined; - IP: string | undefined; - } - export const HttpPattern = /https?:\/\//; - export const ShapeSplitterRegEx = /.*,\s*(\d+).*/; - export const SvgHeightRegex = /(\(type: T, payload?: M[T]): void; diff --git a/src/webviews/webview-side/ipywidgets/kernel/index.ts b/src/webviews/webview-side/ipywidgets/kernel/index.ts index 4dd53124f5c..591c2e8c2b9 100644 --- a/src/webviews/webview-side/ipywidgets/kernel/index.ts +++ b/src/webviews/webview-side/ipywidgets/kernel/index.ts @@ -6,11 +6,7 @@ import { KernelMessagingApi, PostOffice } from '../../react-common/postOffice'; import { WidgetManager } from '../common/manager'; import { ScriptManager } from '../common/scriptManager'; import { OutputItem } from 'vscode-notebook-renderer'; -import { - SharedMessages, - IInteractiveWindowMapping, - InteractiveWindowMessages -} from '../../../../platform/messageTypes'; +import { SharedMessages, IInteractiveWindowMapping, InteractiveWindowMessages } from '../../../../messageTypes'; import { logMessage } from '../../react-common/logger'; class WidgetManagerComponent { diff --git a/src/webviews/webview-side/ipywidgets/webViews/container.tsx b/src/webviews/webview-side/ipywidgets/webViews/container.tsx index 159442ab855..e9e1a06ef0e 100644 --- a/src/webviews/webview-side/ipywidgets/webViews/container.tsx +++ b/src/webviews/webview-side/ipywidgets/webViews/container.tsx @@ -10,7 +10,7 @@ import { LoadIPyWidgetClassLoadAction, NotifyIPyWidgetWidgetVersionNotSupportedAction, SharedMessages -} from '../../../../platform/messageTypes'; +} from '../../../../messageTypes'; import { IJupyterExtraSettings } from '../../../../platform/webviews/types'; import { CommonAction, CommonActionType } from '../../interactive-common/redux/reducers/types'; import { IStore } from '../../interactive-common/redux/store'; diff --git a/src/webviews/webview-side/plot/mainPanel.tsx b/src/webviews/webview-side/plot/mainPanel.tsx index 13ea84d0ef8..5c7395b12af 100644 --- a/src/webviews/webview-side/plot/mainPanel.tsx +++ b/src/webviews/webview-side/plot/mainPanel.tsx @@ -15,10 +15,10 @@ import { SvgViewer } from '../react-common/svgViewer'; import { TestSvg } from './testSvg'; import { Toolbar } from './toolbar'; import { createDeferred } from '../../../platform/common/utils/async'; -import { SharedMessages } from '../../../platform/messageTypes'; +import { SharedMessages } from '../../../messageTypes'; import { IPlotViewerMapping, PlotViewerMessages } from '../../extension-side/plotting/types'; import { IJupyterExtraSettings } from '../../../platform/webviews/types'; -import { RegExpValues } from '../common/constants'; +import { RegExpValues } from '../../../platform/common/constants'; // Our css has to come after in order to override body styles export interface IMainPanelProps { diff --git a/src/webviews/webview-side/variable-view/redux/actions.ts b/src/webviews/webview-side/variable-view/redux/actions.ts index 3855ba0f2bb..afee4210a7b 100644 --- a/src/webviews/webview-side/variable-view/redux/actions.ts +++ b/src/webviews/webview-side/variable-view/redux/actions.ts @@ -3,7 +3,7 @@ 'use strict'; import { IJupyterVariable, IJupyterVariablesRequest } from '../../../../kernels/variables/types'; -import { IInteractiveWindowMapping, InteractiveWindowMessages } from '../../../../platform/messageTypes'; +import { IInteractiveWindowMapping, InteractiveWindowMessages } from '../../../../messageTypes'; import { CommonAction, CommonActionType, diff --git a/src/webviews/webview-side/variable-view/redux/mapping.ts b/src/webviews/webview-side/variable-view/redux/mapping.ts index 0f15e7a043b..4e031451725 100644 --- a/src/webviews/webview-side/variable-view/redux/mapping.ts +++ b/src/webviews/webview-side/variable-view/redux/mapping.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. 'use strict'; -import { InteractiveWindowMessages, IInteractiveWindowMapping } from '../../../../platform/messageTypes'; +import { InteractiveWindowMessages, IInteractiveWindowMapping } from '../../../../messageTypes'; import { BaseReduxActionPayload } from '../../../types'; import { IMainState } from '../../interactive-common/mainState'; import { CommonActionType, CommonActionTypeMapping } from '../../interactive-common/redux/reducers/types'; diff --git a/src/webviews/webview-side/variable-view/redux/reducers/index.ts b/src/webviews/webview-side/variable-view/redux/reducers/index.ts index 4d48e27c744..32f30acb0f2 100644 --- a/src/webviews/webview-side/variable-view/redux/reducers/index.ts +++ b/src/webviews/webview-side/variable-view/redux/reducers/index.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. 'use strict'; -import { InteractiveWindowMessages, SharedMessages } from '../../../../../platform/messageTypes'; +import { InteractiveWindowMessages, SharedMessages } from '../../../../../messageTypes'; import { CommonEffects } from '../../../interactive-common/redux/reducers/commonEffects'; import { Transfer } from '../../../interactive-common/redux/reducers/transfer'; import { CommonActionType } from '../../../interactive-common/redux/reducers/types'; diff --git a/typings/dom.fix.rx.compiler.d.ts b/types/dom.fix.rx.compiler.d.ts similarity index 100% rename from typings/dom.fix.rx.compiler.d.ts rename to types/dom.fix.rx.compiler.d.ts diff --git a/typings/extensions.d.ts b/types/extensions.d.ts similarity index 100% rename from typings/extensions.d.ts rename to types/extensions.d.ts diff --git a/typings/index.d.ts b/types/index.d.ts similarity index 100% rename from typings/index.d.ts rename to types/index.d.ts