@jupyterlab/terminal-extension 4.6.2 → 4.7.0-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/index.js CHANGED
@@ -1,6 +1,5 @@
1
1
  // Copyright (c) Jupyter Development Team.
2
2
  // Distributed under the terms of the Modified BSD License.
3
- /* eslint-disable @typescript-eslint/no-explicit-any */
4
3
  /**
5
4
  * @packageDocumentation
6
5
  * @module terminal-extension
@@ -15,7 +14,7 @@ import { IRunningSessionManagers } from '@jupyterlab/running';
15
14
  import { TerminalAPI } from '@jupyterlab/services';
16
15
  import { ISettingRegistry } from '@jupyterlab/settingregistry';
17
16
  import { IStatusBar, TextItem } from '@jupyterlab/statusbar';
18
- import { ITerminalTracker, Terminal as XTerm } from '@jupyterlab/terminal';
17
+ import { ITerminal, ITerminalTracker, Terminal as XTerm } from '@jupyterlab/terminal';
19
18
  import { ITranslator } from '@jupyterlab/translation';
20
19
  import { copyIcon, pasteIcon, refreshIcon, terminalIcon } from '@jupyterlab/ui-components';
21
20
  import { VDomRenderer } from '@jupyterlab/ui-components';
@@ -42,6 +41,7 @@ var CommandIDs;
42
41
  * The duration in milliseconds to display the escape hint.
43
42
  */
44
43
  const ESCAPE_HINT_DISPLAY_MS = 1500;
44
+ const TERMINAL_OPTION_KEYS = new Set(Object.keys(ITerminal.defaultOptions));
45
45
  /**
46
46
  * The default terminal extension.
47
47
  */
@@ -167,8 +167,13 @@ function activate(app, settingRegistry, translator, palette, launcher, restorer,
167
167
  // Update the cached options by doing a shallow copy of key/values.
168
168
  // This is needed because options is passed and used in addcommand-palette and needs
169
169
  // to reflect the current cached values.
170
- Object.keys(settings.composite).forEach((key) => {
171
- options[key] = settings.composite[key];
170
+ Object.keys(options).forEach(key => {
171
+ Reflect.deleteProperty(options, key);
172
+ });
173
+ Object.entries(settings.composite).forEach(([key, value]) => {
174
+ if (Private.isTerminalOption(key)) {
175
+ Object.assign(options, { [key]: value });
176
+ }
172
177
  });
173
178
  }
174
179
  /**
@@ -685,6 +690,13 @@ function addCommands(app, tracker, settingRegistry, translator, options) {
685
690
  */
686
691
  var Private;
687
692
  (function (Private) {
693
+ /**
694
+ * Whether a setting key is a terminal widget option.
695
+ */
696
+ function isTerminalOption(key) {
697
+ return TERMINAL_OPTION_KEYS.has(key);
698
+ }
699
+ Private.isTerminalOption = isTerminalOption;
688
700
  /**
689
701
  * Utility function for consistent error reporting
690
702
  */
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -173,6 +173,10 @@ export class TerminalSearchProvider extends SearchProvider {
173
173
  // The following two need to be in string #rrggbb format to be acceptable to xtermjs.
174
174
  activeMatchBackground,
175
175
  matchBackground,
176
+ // The selection is rendered above the search decorations and hides
177
+ // activeMatchBackground on the active match; the border is drawn on
178
+ // the decoration overlay itself and stays visible.
179
+ activeMatchBorder: activeMatchBackground,
176
180
  // The following two are compulsory so they need to be set but we do not use them.
177
181
  matchOverviewRuler: '',
178
182
  activeMatchColorOverviewRuler: ''
@@ -1 +1 @@
1
- {"version":3,"file":"searchprovider.js","sourceRoot":"","sources":["../src/searchprovider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"searchprovider.js","sourceRoot":"","sources":["../src/searchprovider.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKtD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAOhD,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B;;GAEG;AACH,MAAM,OAAO,sBAAuB,SAAQ,cAA8B;IACxE;;;;OAIG;IACH,YAAsB,MAAsB;QAC1C,KAAK,CAAC,MAAM,CAAC,CAAC;QADM,WAAM,GAAN,MAAM,CAAgB;QA+OnC,eAAU,GAAG,IAAI,CAAC;QAGnB,uBAAkB,GAAkB,IAAI,CAAC;QACzC,kBAAa,GAAkB,IAAI,CAAC;QAhP1C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;QAErC,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE;YAC9C,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;YAC3C,IAAI,CAAC,kBAAkB,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;YAC/D,IAAI,CAAC,aAAa,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,4BAA4B;QAC5B,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAED;;;;;;;;;;OAUG;IACH,MAAM,CAAC,SAAS,CACd,MAAsB,EACtB,UAAwB;QAExB,OAAO,IAAI,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,YAAY,CAAC,MAAc;QAChC,OAAO,CACL,MAAM,YAAY,cAAc,IAAI,MAAM,CAAC,OAAO,YAAY,QAAQ,CACvE,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,aAAa;QACjB,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,mBAAmB,CACvB,OAAe,EACf,IAAc,EACd,OAAyB;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,iBAAiB,CACrB,OAAe,EACf,OAAyB;QAEzB,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CAAC,KAAa;QAC5B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED;;OAEG;IACK,MAAM;QACZ,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;IACrD,CAAC;IAED;;;;;;OAMG;IACK,cAAc,CAAC,KAAa,EAAE,eAAuB;QAC3D,IAAI,CAAC;YACH,IAAI,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7B,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC;YAChC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACd,SAAS,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,CAAC;YAC3D,CAAC;YACD,OAAO,SAAS,CAAC,GAAG,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,wDAAwD;YACxD,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEO,KAAK;QACX,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CACtC,MAAM,EACN,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAC3B,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,eAAe;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAClD,MAAM,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;QAC7B,MAAM,qBAAqB,GAAG,IAAI,CAAC,cAAc,CAC/C,KAAK,CAAC,qBAAqB,EAC3B,UAAU,CACX,CAAC;QACF,wDAAwD;QACxD,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CACzC,KAAK,CAAC,mBAAmB,EACzB,UAAU,CACX,CAAC;QAEF,IAAI,CAAC,wBAAwB,GAAG;YAC9B,qFAAqF;YACrF,qBAAqB;YACrB,eAAe;YACf,mEAAmE;YACnE,oEAAoE;YACpE,mDAAmD;YACnD,iBAAiB,EAAE,qBAAqB;YACxC,kFAAkF;YAClF,kBAAkB,EAAE,EAAE;YACtB,6BAA6B,EAAE,EAAE;SAClC,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC9B,qFAAqF;YACrF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;YACnD,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;IACH,CAAC;IAEO,SAAS;QACf,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAC1C,MAAM,EACN,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAC3B,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACK,cAAc,CAAC,KAAa;QAClC,OAAO;YACL,aAAa,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnC,WAAW,EAAE,KAAK;YAClB,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,KAAK,EAAE,sBAAsB;YACxC,WAAW,EAAE,IAAI,CAAC,wBAAwB;SAC3C,CAAC;IACJ,CAAC;CAQF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jupyterlab/terminal-extension",
3
- "version": "4.6.2",
3
+ "version": "4.7.0-alpha.1",
4
4
  "description": "JupyterLab - Terminal Emulator Extension",
5
5
  "homepage": "https://github.com/jupyterlab/jupyterlab",
6
6
  "bugs": {
@@ -37,21 +37,21 @@
37
37
  "watch": "tsc -b --watch"
38
38
  },
39
39
  "dependencies": {
40
- "@jupyterlab/application": "^4.6.2",
41
- "@jupyterlab/apputils": "^4.7.2",
42
- "@jupyterlab/documentsearch": "^4.6.2",
43
- "@jupyterlab/filebrowser": "^4.6.2",
44
- "@jupyterlab/launcher": "^4.6.2",
45
- "@jupyterlab/mainmenu": "^4.6.2",
46
- "@jupyterlab/running": "^4.6.2",
47
- "@jupyterlab/services": "^7.6.2",
48
- "@jupyterlab/settingregistry": "^4.6.2",
49
- "@jupyterlab/statusbar": "^4.6.2",
50
- "@jupyterlab/terminal": "^4.6.2",
51
- "@jupyterlab/translation": "^4.6.2",
52
- "@jupyterlab/ui-components": "^4.6.2",
53
- "@lumino/widgets": "^2.8.0",
54
- "@xterm/addon-search": "~0.15.0",
40
+ "@jupyterlab/application": "^4.7.0-alpha.1",
41
+ "@jupyterlab/apputils": "^4.8.0-alpha.1",
42
+ "@jupyterlab/documentsearch": "^4.7.0-alpha.1",
43
+ "@jupyterlab/filebrowser": "^4.7.0-alpha.1",
44
+ "@jupyterlab/launcher": "^4.7.0-alpha.1",
45
+ "@jupyterlab/mainmenu": "^4.7.0-alpha.1",
46
+ "@jupyterlab/running": "^4.7.0-alpha.1",
47
+ "@jupyterlab/services": "^7.7.0-alpha.1",
48
+ "@jupyterlab/settingregistry": "^4.7.0-alpha.1",
49
+ "@jupyterlab/statusbar": "^4.7.0-alpha.1",
50
+ "@jupyterlab/terminal": "^4.7.0-alpha.1",
51
+ "@jupyterlab/translation": "^4.7.0-alpha.1",
52
+ "@jupyterlab/ui-components": "^4.7.0-alpha.1",
53
+ "@lumino/widgets": "^2.9.0",
54
+ "@xterm/addon-search": "~0.16.0",
55
55
  "color": "^5.0.0"
56
56
  },
57
57
  "devDependencies": {
package/src/index.ts CHANGED
@@ -1,6 +1,5 @@
1
1
  // Copyright (c) Jupyter Development Team.
2
2
  // Distributed under the terms of the Modified BSD License.
3
- /* eslint-disable @typescript-eslint/no-explicit-any */
4
3
  /**
5
4
  * @packageDocumentation
6
5
  * @module terminal-extension
@@ -29,8 +28,11 @@ import type { Terminal } from '@jupyterlab/services';
29
28
  import { TerminalAPI } from '@jupyterlab/services';
30
29
  import { ISettingRegistry } from '@jupyterlab/settingregistry';
31
30
  import { IStatusBar, TextItem } from '@jupyterlab/statusbar';
32
- import type { ITerminal } from '@jupyterlab/terminal';
33
- import { ITerminalTracker, Terminal as XTerm } from '@jupyterlab/terminal';
31
+ import {
32
+ ITerminal,
33
+ ITerminalTracker,
34
+ Terminal as XTerm
35
+ } from '@jupyterlab/terminal';
34
36
  import { ITranslator } from '@jupyterlab/translation';
35
37
  import {
36
38
  copyIcon,
@@ -74,6 +76,10 @@ namespace CommandIDs {
74
76
  */
75
77
  const ESCAPE_HINT_DISPLAY_MS = 1500;
76
78
 
79
+ const TERMINAL_OPTION_KEYS = new Set<string>(
80
+ Object.keys(ITerminal.defaultOptions)
81
+ );
82
+
77
83
  /**
78
84
  * The default terminal extension.
79
85
  */
@@ -231,8 +237,13 @@ function activate(
231
237
  // Update the cached options by doing a shallow copy of key/values.
232
238
  // This is needed because options is passed and used in addcommand-palette and needs
233
239
  // to reflect the current cached values.
234
- Object.keys(settings.composite).forEach((key: keyof ITerminal.IOptions) => {
235
- (options as any)[key] = settings.composite[key];
240
+ Object.keys(options).forEach(key => {
241
+ Reflect.deleteProperty(options, key);
242
+ });
243
+ Object.entries(settings.composite).forEach(([key, value]) => {
244
+ if (Private.isTerminalOption(key)) {
245
+ Object.assign(options, { [key]: value });
246
+ }
236
247
  });
237
248
  }
238
249
 
@@ -813,6 +824,15 @@ function addCommands(
813
824
  * A namespace for private data.
814
825
  */
815
826
  namespace Private {
827
+ /**
828
+ * Whether a setting key is a terminal widget option.
829
+ */
830
+ export function isTerminalOption(
831
+ key: string
832
+ ): key is keyof ITerminal.IOptions {
833
+ return TERMINAL_OPTION_KEYS.has(key);
834
+ }
835
+
816
836
  /**
817
837
  * Utility function for consistent error reporting
818
838
  */
@@ -224,6 +224,10 @@ export class TerminalSearchProvider extends SearchProvider<TerminalWidget> {
224
224
  // The following two need to be in string #rrggbb format to be acceptable to xtermjs.
225
225
  activeMatchBackground,
226
226
  matchBackground,
227
+ // The selection is rendered above the search decorations and hides
228
+ // activeMatchBackground on the active match; the border is drawn on
229
+ // the decoration overlay itself and stays visible.
230
+ activeMatchBorder: activeMatchBackground,
227
231
  // The following two are compulsory so they need to be set but we do not use them.
228
232
  matchOverviewRuler: '',
229
233
  activeMatchColorOverviewRuler: ''