@theia/terminal 1.65.0-next.6 → 1.65.1

package/src/browser/terminal-theme-service.ts

@@ -17,160 +17,10 @@
 import { ITheme } from 'xterm';
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
-import { ColorDefaults } from '@theia/core/lib/common/color';
 import { ThemeService } from '@theia/core/lib/browser/theming';
 import { ThemeChangeEvent } from '@theia/core/lib/common/theme';
 import { Event } from '@theia/core';
-
-/**
- * It should be aligned with https://github.com/microsoft/vscode/blob/0dfa355b3ad185a6289ba28a99c141ab9e72d2be/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.ts#L40
- */
-export const terminalAnsiColorMap: { [key: string]: { index: number, defaults: ColorDefaults } } = {
-    'terminal.ansiBlack': {
-        index: 0,
-        defaults: {
-            light: '#000000',
-            dark: '#000000',
-            hcDark: '#000000',
-            hcLight: '#292929'
-        }
-    },
-    'terminal.ansiRed': {
-        index: 1,
-        defaults: {
-            light: '#cd3131',
-            dark: '#cd3131',
-            hcDark: '#cd0000',
-            hcLight: '#cd3131'
-        }
-    },
-    'terminal.ansiGreen': {
-        index: 2,
-        defaults: {
-            light: '#00BC00',
-            dark: '#0DBC79',
-            hcDark: '#00cd00',
-            hcLight: '#00bc00'
-        }
-    },
-    'terminal.ansiYellow': {
-        index: 3,
-        defaults: {
-            light: '#949800',
-            dark: '#e5e510',
-            hcDark: '#cdcd00',
-            hcLight: '#949800'
-        }
-    },
-    'terminal.ansiBlue': {
-        index: 4,
-        defaults: {
-            light: '#0451a5',
-            dark: '#2472c8',
-            hcDark: '#0000ee',
-            hcLight: '#0451a5'
-        }
-    },
-    'terminal.ansiMagenta': {
-        index: 5,
-        defaults: {
-            light: '#bc05bc',
-            dark: '#bc3fbc',
-            hcDark: '#cd00cd',
-            hcLight: '#bc05bc'
-        }
-    },
-    'terminal.ansiCyan': {
-        index: 6,
-        defaults: {
-            light: '#0598bc',
-            dark: '#11a8cd',
-            hcDark: '#00cdcd',
-            hcLight: '#0598b'
-        }
-    },
-    'terminal.ansiWhite': {
-        index: 7,
-        defaults: {
-            light: '#555555',
-            dark: '#e5e5e5',
-            hcDark: '#e5e5e5',
-            hcLight: '#555555'
-        }
-    },
-    'terminal.ansiBrightBlack': {
-        index: 8,
-        defaults: {
-            light: '#666666',
-            dark: '#666666',
-            hcDark: '#7f7f7f',
-            hcLight: '#666666'
-        }
-    },
-    'terminal.ansiBrightRed': {
-        index: 9,
-        defaults: {
-            light: '#cd3131',
-            dark: '#f14c4c',
-            hcDark: '#ff0000',
-            hcLight: '#cd3131'
-        }
-    },
-    'terminal.ansiBrightGreen': {
-        index: 10,
-        defaults: {
-            light: '#14CE14',
-            dark: '#23d18b',
-            hcDark: '#00ff00',
-            hcLight: '#00bc00'
-        }
-    },
-    'terminal.ansiBrightYellow': {
-        index: 11,
-        defaults: {
-            light: '#b5ba00',
-            dark: '#f5f543',
-            hcDark: '#ffff00',
-            hcLight: '#b5ba00'
-        }
-    },
-    'terminal.ansiBrightBlue': {
-        index: 12,
-        defaults: {
-            light: '#0451a5',
-            dark: '#3b8eea',
-            hcDark: '#5c5cff',
-            hcLight: '#0451a5'
-        }
-    },
-    'terminal.ansiBrightMagenta': {
-        index: 13,
-        defaults: {
-            light: '#bc05bc',
-            dark: '#d670d6',
-            hcDark: '#ff00ff',
-            hcLight: '#bc05bc'
-        }
-    },
-    'terminal.ansiBrightCyan': {
-        index: 14,
-        defaults: {
-            light: '#0598bc',
-            dark: '#29b8db',
-            hcDark: '#00ffff',
-            hcLight: '#0598bc'
-        }
-    },
-    'terminal.ansiBrightWhite': {
-        index: 15,
-        defaults: {
-            light: '#a5a5a5',
-            dark: '#e5e5e5',
-            hcDark: '#ffffff',
-            hcLight: '#a5a5a5'
-        }
-    }
-};
+import { terminalAnsiColorMap } from '../common/terminal-preferences';
 
 @injectable()
 export class TerminalThemeService {

package/src/browser/terminal-widget-impl.ts

@@ -34,7 +34,7 @@ import {
     TerminalBuffer
 } from './base/terminal-widget';
 import { Deferred } from '@theia/core/lib/common/promise-util';
-import { TerminalPreferences } from './terminal-preferences';
+import { TerminalPreferences } from '../common/terminal-preferences';
 import URI from '@theia/core/lib/common/uri';
 import { TerminalService } from './base/terminal-service';
 import { TerminalSearchWidgetFactory, TerminalSearchWidget } from './search/terminal-search-widget';

package/src/{browser → common}/terminal-preferences.ts

@@ -18,13 +18,165 @@
 
 import { interfaces } from '@theia/core/shared/inversify';
 import { IJSONSchema } from '@theia/core/lib/common/json-schema';
-import { createPreferenceProxy, PreferenceProxy, PreferenceService, PreferenceContribution, PreferenceSchema, PreferenceSchemaProperties } from '@theia/core/lib/browser';
+import { PreferenceService } from '@theia/core/lib/common';
+import { createPreferenceProxy, PreferenceProxy } from '@theia/core/lib/common/preferences/preference-proxy';
 import { nls } from '@theia/core/lib/common/nls';
-import { editorGeneratedPreferenceProperties } from '@theia/editor/lib/browser/editor-generated-preference-schema';
+import { editorGeneratedPreferenceProperties } from '@theia/editor/lib/common/editor-generated-preference-schema';
 import { OS } from '@theia/core';
-import { terminalAnsiColorMap } from './terminal-theme-service';
+import { PreferenceContribution, PreferenceSchema } from '@theia/core/lib/common/preferences/preference-schema';
+import { ColorDefaults } from '@theia/core/lib/common/color';
 
-const commonProfileProperties: PreferenceSchemaProperties = {
+/**
+ * It should be aligned with https://github.com/microsoft/vscode/blob/0dfa355b3ad185a6289ba28a99c141ab9e72d2be/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.ts#L40
+ */
+export const terminalAnsiColorMap: { [key: string]: { index: number, defaults: ColorDefaults } } = {
+    'terminal.ansiBlack': {
+        index: 0,
+        defaults: {
+            light: '#000000',
+            dark: '#000000',
+            hcDark: '#000000',
+            hcLight: '#292929'
+        }
+    },
+    'terminal.ansiRed': {
+        index: 1,
+        defaults: {
+            light: '#cd3131',
+            dark: '#cd3131',
+            hcDark: '#cd0000',
+            hcLight: '#cd3131'
+        }
+    },
+    'terminal.ansiGreen': {
+        index: 2,
+        defaults: {
+            light: '#00BC00',
+            dark: '#0DBC79',
+            hcDark: '#00cd00',
+            hcLight: '#00bc00'
+        }
+    },
+    'terminal.ansiYellow': {
+        index: 3,
+        defaults: {
+            light: '#949800',
+            dark: '#e5e510',
+            hcDark: '#cdcd00',
+            hcLight: '#949800'
+        }
+    },
+    'terminal.ansiBlue': {
+        index: 4,
+        defaults: {
+            light: '#0451a5',
+            dark: '#2472c8',
+            hcDark: '#0000ee',
+            hcLight: '#0451a5'
+        }
+    },
+    'terminal.ansiMagenta': {
+        index: 5,
+        defaults: {
+            light: '#bc05bc',
+            dark: '#bc3fbc',
+            hcDark: '#cd00cd',
+            hcLight: '#bc05bc'
+        }
+    },
+    'terminal.ansiCyan': {
+        index: 6,
+        defaults: {
+            light: '#0598bc',
+            dark: '#11a8cd',
+            hcDark: '#00cdcd',
+            hcLight: '#0598b'
+        }
+    },
+    'terminal.ansiWhite': {
+        index: 7,
+        defaults: {
+            light: '#555555',
+            dark: '#e5e5e5',
+            hcDark: '#e5e5e5',
+            hcLight: '#555555'
+        }
+    },
+    'terminal.ansiBrightBlack': {
+        index: 8,
+        defaults: {
+            light: '#666666',
+            dark: '#666666',
+            hcDark: '#7f7f7f',
+            hcLight: '#666666'
+        }
+    },
+    'terminal.ansiBrightRed': {
+        index: 9,
+        defaults: {
+            light: '#cd3131',
+            dark: '#f14c4c',
+            hcDark: '#ff0000',
+            hcLight: '#cd3131'
+        }
+    },
+    'terminal.ansiBrightGreen': {
+        index: 10,
+        defaults: {
+            light: '#14CE14',
+            dark: '#23d18b',
+            hcDark: '#00ff00',
+            hcLight: '#00bc00'
+        }
+    },
+    'terminal.ansiBrightYellow': {
+        index: 11,
+        defaults: {
+            light: '#b5ba00',
+            dark: '#f5f543',
+            hcDark: '#ffff00',
+            hcLight: '#b5ba00'
+        }
+    },
+    'terminal.ansiBrightBlue': {
+        index: 12,
+        defaults: {
+            light: '#0451a5',
+            dark: '#3b8eea',
+            hcDark: '#5c5cff',
+            hcLight: '#0451a5'
+        }
+    },
+    'terminal.ansiBrightMagenta': {
+        index: 13,
+        defaults: {
+            light: '#bc05bc',
+            dark: '#d670d6',
+            hcDark: '#ff00ff',
+            hcLight: '#bc05bc'
+        }
+    },
+    'terminal.ansiBrightCyan': {
+        index: 14,
+        defaults: {
+            light: '#0598bc',
+            dark: '#29b8db',
+            hcDark: '#00ffff',
+            hcLight: '#0598bc'
+        }
+    },
+    'terminal.ansiBrightWhite': {
+        index: 15,
+        defaults: {
+            light: '#a5a5a5',
+            dark: '#e5e5e5',
+            hcDark: '#ffffff',
+            hcLight: '#a5a5a5'
+        }
+    }
+};
+
+const commonProfileProperties: PreferenceSchema['properties'] = {
     env: {
         type: 'object',
         additionalProperties: {
@@ -69,7 +221,6 @@ function shellArgsDeprecatedMessage(type: OS.Type): string {
 }
 
 export const TerminalConfigSchema: PreferenceSchema = {
-    type: 'object',
     properties: {
         'terminal.enableCopy': {
             type: 'boolean',

package/src/node/terminal-backend-module.ts

@@ -25,6 +25,7 @@ import { IShellTerminalServer, shellTerminalPath } from '../common/shell-termina
 import { ShellTerminalServer } from '../node/shell-terminal-server';
 import { TerminalWatcher } from '../common/terminal-watcher';
 import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
+import { bindTerminalPreferences } from '../common/terminal-preferences';
 
 export function bindTerminalServer(bind: interfaces.Bind, { path, identifier, constructor }: {
     path: string,
@@ -76,4 +77,5 @@ export default new ContainerModule(bind => {
         identifier: IShellTerminalServer,
         constructor: ShellTerminalServer
     });
+    bindTerminalPreferences(bind);
 });

package/lib/browser/terminal-preferences.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"terminal-preferences.d.ts","sourceRoot":"","sources":["../../src/browser/terminal-preferences.ts"],"names":[],"mappings":"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"}

package/lib/browser/terminal-preferences.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"terminal-preferences.js","sourceRoot":"","sources":["../../src/browser/terminal-preferences.ts"],"names":[],"mappings":"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"}