@opensumi/ide-terminal-next 2.27.3-rc-1708395495.0 → 2.27.3-rc-1710386185.0

package/src/browser/terminal.view.ts

@@ -1,15 +1,15 @@
-import { observable, computed, makeObservable, action } from 'mobx';
+import { action, computed, makeObservable, observable } from 'mobx';
 
-import { Injectable, Autowired } from '@opensumi/di';
-import { Emitter, Disposable, Event } from '@opensumi/ide-core-browser';
+import { Autowired, Injectable } from '@opensumi/di';
+import { Disposable, Emitter, Event } from '@opensumi/ide-core-browser';
 
 import {
+  IShellLaunchConfig,
   ITerminalGroupViewService,
-  IWidget,
   ITerminalInternalService,
-  userActionViewUuid,
+  IWidget,
   IWidgetGroup,
-  IShellLaunchConfig,
+  userActionViewUuid,
 } from '../common';
 
 export class Widget extends Disposable implements IWidget {

package/src/browser/xterm.ts

@@ -1,11 +1,9 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { ITerminalOptions, ITheme, Terminal } from 'xterm';
-import type { CanvasAddon as CanvasAddonType } from 'xterm-addon-canvas';
 import { FitAddon } from 'xterm-addon-fit';
 import { ISearchOptions, SearchAddon } from 'xterm-addon-search';
-import type { WebglAddon as WebglAddonType } from 'xterm-addon-webgl';
 
-import { Injectable, Autowired, Injector, INJECTOR_TOKEN } from '@opensumi/di';
+import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
 import { IClipboardService } from '@opensumi/ide-core-browser';
 import { PreferenceService } from '@opensumi/ide-core-browser/lib/preferences/types';
 import { Disposable } from '@opensumi/ide-core-common';
@@ -14,7 +12,7 @@ import { WorkbenchThemeService } from '@opensumi/ide-theme/lib/browser/workbench
 import { PANEL_BACKGROUND } from '@opensumi/ide-theme/lib/common/color-registry';
 import { IThemeService } from '@opensumi/ide-theme/lib/common/theme.service';
 
-import { SupportedOptions, CodeTerminalSettingId } from '../common/preference';
+import { CodeTerminalSettingId, SupportedOptions } from '../common/preference';
 import { IXTerm, RenderType } from '../common/xterm';
 
 import styles from './component/terminal.module.less';
@@ -28,6 +26,9 @@ import {
   TERMINAL_OVERVIEW_RULER_FIND_MATCH_FOREGROUND_COLOR,
 } from './terminal.color';
 
+import type { CanvasAddon as CanvasAddonType } from 'xterm-addon-canvas';
+import type { WebglAddon as WebglAddonType } from 'xterm-addon-webgl';
+
 export interface XTermOptions {
   cwd?: string;
   // 要传给 xterm 的参数和一些我们自己的参数（如 copyOnSelection）

package/src/common/api.ts

@@ -2,7 +2,7 @@ import { Event } from '@opensumi/ide-core-common';
 
 import { ITerminalExitEvent, ITerminalTitleChangeEvent } from './client';
 import { ITerminalExternalClient } from './controller';
-import { TerminalOptions, ITerminalInfo } from './pty';
+import { ITerminalInfo, TerminalOptions } from './pty';
 
 export const ITerminalApiService = Symbol('ITerminalApiService');
 export interface ITerminalApiService {

package/src/common/client.ts

@@ -1,8 +1,8 @@
 import { Terminal } from 'xterm';
 
-import { IDisposable, Disposable, Event, Deferred } from '@opensumi/ide-core-common';
+import { Deferred, Disposable, Event, IDisposable } from '@opensumi/ide-core-common';
 
-import { INodePtyInstance, TerminalOptions, ICreateTerminalOptions, IShellLaunchConfig } from './pty';
+import { ICreateTerminalOptions, INodePtyInstance, IShellLaunchConfig, TerminalOptions } from './pty';
 import { IWidget } from './resize';
 
 export interface ITerminalDataEvent {

package/src/common/controller.ts

@@ -1,19 +1,21 @@
 import { IContextKeyService } from '@opensumi/ide-core-browser';
-import { Event, Disposable, Deferred, IDisposable, Uri } from '@opensumi/ide-core-common';
+import { Deferred, Disposable, Event, IDisposable, Uri } from '@opensumi/ide-core-common';
 
 // eslint-disable-next-line import/no-restricted-paths
-import type { ILinkHoverTargetOptions } from '../browser/links/link-manager';
 
 import {
   ITerminalClient,
   ITerminalExitEvent,
-  ITerminalTitleChangeEvent,
   ITerminalExternalLinkProvider,
+  ITerminalTitleChangeEvent,
 } from './client';
-import { ITerminalLaunchError, ITerminalProcessExtHostProxy, IStartExtensionTerminalRequest } from './extension';
+import { IStartExtensionTerminalRequest, ITerminalLaunchError, ITerminalProcessExtHostProxy } from './extension';
 import { ITerminalProfile } from './profile';
-import { ITerminalInfo, ICreateTerminalOptions, TerminalOptions, IShellLaunchConfig } from './pty';
-import { IWidgetGroup, IWidget } from './resize';
+import { ICreateTerminalOptions, IShellLaunchConfig, ITerminalInfo, TerminalOptions } from './pty';
+import { IWidget, IWidgetGroup } from './resize';
+
+// eslint-disable-next-line import/no-restricted-paths
+import type { ILinkHoverTargetOptions } from '../browser/links/link-manager';
 
 export interface ITerminalExternalClient {
   readonly id: string;

package/src/common/environmentVariable.ts

@@ -1,4 +1,4 @@
-import { Event, OperatingSystem, IProcessEnvironment } from '@opensumi/ide-core-common';
+import { Event, IProcessEnvironment, OperatingSystem } from '@opensumi/ide-core-common';
 
 export const EnvironmentVariableServiceToken = Symbol('EnvironmentVariableServiceToken');
 

package/src/common/environmentVariableCollection.ts

@@ -8,11 +8,11 @@
 import { IProcessEnvironment, OperatingSystem } from '@opensumi/ide-core-common';
 
 import {
-  IMergedEnvironmentVariableCollection,
-  IExtensionOwnedEnvironmentVariableMutator,
+  EnvironmentVariableMutatorType,
   IEnvironmentVariableCollection,
+  IExtensionOwnedEnvironmentVariableMutator,
+  IMergedEnvironmentVariableCollection,
   IMergedEnvironmentVariableCollectionDiff,
-  EnvironmentVariableMutatorType,
 } from './environmentVariable';
 export class MergedEnvironmentVariableCollection implements IMergedEnvironmentVariableCollection {
   readonly map: Map<string, IExtensionOwnedEnvironmentVariableMutator[]> = new Map();

package/src/common/extension.ts

@@ -1,7 +1,7 @@
-import type vscode from 'vscode';
-
 import { Event, IDisposable, URI } from '@opensumi/ide-core-common';
 
+import type vscode from 'vscode';
+
 export interface IProcessDataEvent {
   data: string;
   sync: boolean;

package/src/common/link-computer.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Some code copied and modified from https://github.com/microsoft/vscode/blob/1.44.0/src/vs/editor/common/modes/linkComputer.ts
 
-import { IRange, URI, CharCode, CharacterClassifier } from '@opensumi/ide-core-common';
+import { CharCode, CharacterClassifier, IRange, URI } from '@opensumi/ide-core-common';
 
 /**
  * A link inside the editor.

package/src/common/preference.ts

@@ -1,5 +1,4 @@
-import { Event, TerminalSettingsId } from '@opensumi/ide-core-common';
-import { localize } from '@opensumi/ide-core-common';
+import { Event, TerminalSettingsId, localize } from '@opensumi/ide-core-common';
 import { PreferenceSchema } from '@opensumi/ide-core-common/lib/preferences';
 
 import { RenderType } from './xterm';

package/src/common/profile.ts

@@ -1,6 +1,4 @@
-import type vscode from 'vscode';
-
-import { IDisposable, Event, URI, OperatingSystem } from '@opensumi/ide-core-common';
+import { Event, IDisposable, OperatingSystem, URI } from '@opensumi/ide-core-common';
 
 import {
   ICreateContributedTerminalProfileOptions,
@@ -10,6 +8,8 @@ import {
   TerminalIcon,
 } from '..';
 
+import type vscode from 'vscode';
+
 export interface IResolveDefaultProfileOptions {
   os?: OperatingSystem;
 }

package/src/common/pty.ts

@@ -1,15 +1,16 @@
 import { IPty as INodePty } from 'node-pty';
 import * as pty from 'node-pty';
-import type vscode from 'vscode';
 import { Terminal as XTerm } from 'xterm';
 
-import { MaybePromise, Uri, OperatingSystem, IThemeColor } from '@opensumi/ide-core-common';
+import { IThemeColor, MaybePromise, OperatingSystem, Uri } from '@opensumi/ide-core-common';
 
 import { ITerminalError } from './error';
 import { ITerminalEnvironment, ITerminalProcessExtHostProxy, TerminalLocation } from './extension';
 import { IDetectProfileOptions, ITerminalProfile } from './profile';
 import { WindowsShellType } from './shell';
 
+import type vscode from 'vscode';
+
 export interface IPtySpawnOptions {
   /**
    * 恢复终端的历史记录的特性

package/src/common/resize.ts

@@ -1,5 +1,4 @@
-import { Event } from '@opensumi/ide-core-common';
-import { Disposable } from '@opensumi/ide-core-common';
+import { Disposable, Event } from '@opensumi/ide-core-common';
 
 import { IShellLaunchConfig } from './pty';
 

package/src/node/index.ts

@@ -1,4 +1,4 @@
-import { Provider, Injectable } from '@opensumi/di';
+import { Injectable, Provider } from '@opensumi/di';
 import { NodeModule } from '@opensumi/ide-core-node';
 
 import {
@@ -9,8 +9,8 @@ import {
   ITerminalServicePath,
 } from '../common';
 
-import { PtyService, IPtyService } from './pty';
-import { PtyServiceManagerToken, PtyServiceManager } from './pty.manager';
+import { IPtyService, PtyService } from './pty';
+import { PtyServiceManager, PtyServiceManagerToken } from './pty.manager';
 import { TerminalProcessServiceImpl } from './terminal.process.service';
 import { ITerminalProfileServiceNode, TerminalProfileServiceNode } from './terminal.profile.service';
 import { TerminalServiceImpl } from './terminal.service';

package/src/node/pty.manager.ts

@@ -1,6 +1,6 @@
 import * as pty from 'node-pty';
 
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import { INodeLogger } from '@opensumi/ide-core-node';
 
 import { IPtyProcessProxy, IPtyProxyRPCService, IPtySpawnOptions, IShellLaunchConfig } from '../common';

package/src/node/pty.proxy.ts

@@ -8,7 +8,7 @@ import * as pty from 'node-pty';
 import { RPCServiceCenter, initRPCService } from '@opensumi/ide-connection';
 import { SumiConnection } from '@opensumi/ide-connection/lib/common/rpc/connection';
 import { DisposableCollection, getDebugLogger } from '@opensumi/ide-core-node';
-import { isMacintosh, isLinux } from '@opensumi/ide-utils/lib/platform';
+import { isLinux, isMacintosh } from '@opensumi/ide-utils/lib/platform';
 
 import {
   IPtyProxyRPCService,

package/src/node/pty.ts

@@ -12,12 +12,12 @@ import omit from 'lodash/omit';
 import * as pty from 'node-pty';
 import * as osLocale from 'os-locale';
 
-import { Injectable, Autowired } from '@opensumi/di';
-import { Disposable, Emitter, INodeLogger, isWindows, path, URI } from '@opensumi/ide-core-node';
+import { Autowired, Injectable } from '@opensumi/di';
+import { Disposable, Emitter, INodeLogger, URI, isWindows, path } from '@opensumi/ide-core-node';
 import { getShellPath } from '@opensumi/ide-core-node/lib/bootstrap/shell-path';
 
 import { IShellLaunchConfig, ITerminalLaunchError } from '../common';
-import { IProcessReadyEvent, IProcessExitEvent } from '../common/process';
+import { IProcessExitEvent, IProcessReadyEvent } from '../common/process';
 import { IPtyProcessProxy, IPtySpawnOptions } from '../common/pty';
 
 import { IPtyServiceManager, PtyServiceManagerToken } from './pty.manager';

package/src/node/shell.ts

@@ -8,9 +8,9 @@
 // - https://github.com/microsoft/vscode/blob/ff383268424b1d4b6620e7ea197fb13ae513414f/src/vs/base/node/shell.ts
 
 import fs from 'fs';
-import { userInfo, release } from 'os';
+import { release, userInfo } from 'os';
 
-import { IProcessEnvironment, isLinux, isMacintosh, OperatingSystem, path } from '@opensumi/ide-core-common';
+import { IProcessEnvironment, OperatingSystem, isLinux, isMacintosh, path } from '@opensumi/ide-core-common';
 import { isWindows } from '@opensumi/ide-core-node';
 
 export const WINDOWS_GIT_BASH_PATHS = [

package/src/node/terminal.profile.service.ts

@@ -6,11 +6,10 @@
 // some code copied and modified from https://github.com/microsoft/vscode/blob/ff383268424b1d4b6620e7ea197fb13ae513414f/src/vs/platform/terminal/node/terminalProfiles.ts
 
 import { readFile } from 'fs-extra';
-import type vscode from 'vscode';
 
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import { URI } from '@opensumi/ide-core-common';
-import { INodeLogger, path, isWindows } from '@opensumi/ide-core-node';
+import { INodeLogger, isWindows, path } from '@opensumi/ide-core-node';
 
 import { IDetectProfileOptions, ITerminalEnvironment } from '..';
 import {
@@ -20,7 +19,9 @@ import {
   ProfileSource,
 } from '../common/profile';
 
-import { exists, findExecutable, getPowershellPaths, WINDOWS_GIT_BASH_PATHS } from './shell';
+import { WINDOWS_GIT_BASH_PATHS, exists, findExecutable, getPowershellPaths } from './shell';
+
+import type vscode from 'vscode';
 
 function applyConfigProfilesToMap(
   configProfiles: { [key: string]: IUnresolvedTerminalProfile } | undefined,

package/src/node/terminal.service.client.ts

@@ -1,19 +1,19 @@
-import { Injectable, Autowired } from '@opensumi/di';
+import { Autowired, Injectable } from '@opensumi/di';
 import { RPCService } from '@opensumi/ide-connection';
-import { INodeLogger, OperatingSystem, isWindows, isMacintosh } from '@opensumi/ide-core-node';
+import { INodeLogger, OperatingSystem, isMacintosh, isWindows } from '@opensumi/ide-core-node';
 
 import {
+  INodePtyInstance,
   IShellLaunchConfig,
+  ITerminalError,
   ITerminalNodeService,
   ITerminalServiceClient,
-  INodePtyInstance,
-  ITerminalError,
 } from '../common';
 import { IDetectProfileOptions, ITerminalProfile } from '../common/profile';
 import { IPtyProcessProxy } from '../common/pty';
-import { WindowsShellType, WINDOWS_DEFAULT_SHELL_PATH_MAPS } from '../common/shell';
+import { WINDOWS_DEFAULT_SHELL_PATH_MAPS, WindowsShellType } from '../common/shell';
 
-import { findShellExecutableAsync, getSystemShell, WINDOWS_GIT_BASH_PATHS } from './shell';
+import { WINDOWS_GIT_BASH_PATHS, findShellExecutableAsync, getSystemShell } from './shell';
 import { ITerminalProfileServiceNode, TerminalProfileServiceNode } from './terminal.profile.service';
 
 /**

package/src/node/terminal.service.ts

@@ -1,5 +1,5 @@
-import { Injectable, Autowired, INJECTOR_TOKEN, Injector } from '@opensumi/di';
-import { INodeLogger, AppConfig, isDevelopment, isElectronNode } from '@opensumi/ide-core-node';
+import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
+import { AppConfig, INodeLogger, isDevelopment, isElectronNode } from '@opensumi/ide-core-node';
 
 import { ETerminalErrorType, ITerminalNodeService, ITerminalServiceClient, TERMINAL_ID_SEPARATOR } from '../common';
 import { IPtyProcessProxy, IShellLaunchConfig } from '../common/pty';