@jupyterlab/terminal-extension 4.5.0-alpha.1 → 4.5.0-alpha.3
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 +101 -6
- package/lib/index.js.map +1 -1
- package/lib/searchprovider.d.ts +114 -0
- package/lib/searchprovider.js +209 -0
- package/lib/searchprovider.js.map +1 -0
- package/package.json +15 -12
- package/src/index.ts +108 -6
- package/src/searchprovider.ts +272 -0
- package/style/index.css +1 -0
- package/style/index.js +1 -0
package/lib/index.js
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { ILayoutRestorer } from '@jupyterlab/application';
|
|
8
8
|
import { Clipboard, ICommandPalette, IThemeManager, MainAreaWidget, WidgetTracker } from '@jupyterlab/apputils';
|
|
9
|
+
import { ISearchProviderRegistry } from '@jupyterlab/documentsearch';
|
|
9
10
|
import { ILauncher } from '@jupyterlab/launcher';
|
|
10
11
|
import { IMainMenu } from '@jupyterlab/mainmenu';
|
|
11
12
|
import { IRunningSessionManagers } from '@jupyterlab/running';
|
|
@@ -15,6 +16,7 @@ import { ITerminalTracker, Terminal as XTerm } from '@jupyterlab/terminal';
|
|
|
15
16
|
import { ITranslator } from '@jupyterlab/translation';
|
|
16
17
|
import { copyIcon, pasteIcon, refreshIcon, terminalIcon } from '@jupyterlab/ui-components';
|
|
17
18
|
import { Menu } from '@lumino/widgets';
|
|
19
|
+
import { TerminalSearchProvider } from './searchprovider';
|
|
18
20
|
/**
|
|
19
21
|
* The command IDs used by the terminal plugin.
|
|
20
22
|
*/
|
|
@@ -45,7 +47,8 @@ const plugin = {
|
|
|
45
47
|
ILayoutRestorer,
|
|
46
48
|
IMainMenu,
|
|
47
49
|
IThemeManager,
|
|
48
|
-
IRunningSessionManagers
|
|
50
|
+
IRunningSessionManagers,
|
|
51
|
+
ISearchProviderRegistry
|
|
49
52
|
],
|
|
50
53
|
autoStart: true
|
|
51
54
|
};
|
|
@@ -56,7 +59,7 @@ export default plugin;
|
|
|
56
59
|
/**
|
|
57
60
|
* Activate the terminal plugin.
|
|
58
61
|
*/
|
|
59
|
-
function activate(app, settingRegistry, translator, palette, launcher, restorer, mainMenu, themeManager, runningSessionManagers) {
|
|
62
|
+
function activate(app, settingRegistry, translator, palette, launcher, restorer, mainMenu, themeManager, runningSessionManagers, searchRegistry) {
|
|
60
63
|
const trans = translator.load('jupyterlab');
|
|
61
64
|
const { serviceManager, commands } = app;
|
|
62
65
|
const category = trans.__('Terminal');
|
|
@@ -215,6 +218,9 @@ function activate(app, settingRegistry, translator, palette, launcher, restorer,
|
|
|
215
218
|
if (runningSessionManagers) {
|
|
216
219
|
addRunningSessionManager(runningSessionManagers, app, translator);
|
|
217
220
|
}
|
|
221
|
+
if (searchRegistry) {
|
|
222
|
+
searchRegistry.add('terminal', TerminalSearchProvider);
|
|
223
|
+
}
|
|
218
224
|
return tracker;
|
|
219
225
|
}
|
|
220
226
|
/**
|
|
@@ -302,6 +308,25 @@ function addCommands(app, tracker, settingRegistry, translator, options) {
|
|
|
302
308
|
void tracker.add(main);
|
|
303
309
|
app.shell.activateById(main.id);
|
|
304
310
|
return main;
|
|
311
|
+
},
|
|
312
|
+
describedBy: {
|
|
313
|
+
args: {
|
|
314
|
+
type: 'object',
|
|
315
|
+
properties: {
|
|
316
|
+
name: {
|
|
317
|
+
type: 'string',
|
|
318
|
+
description: trans.__('Terminal session name')
|
|
319
|
+
},
|
|
320
|
+
cwd: {
|
|
321
|
+
type: 'string',
|
|
322
|
+
description: trans.__('Current working directory for the terminal')
|
|
323
|
+
},
|
|
324
|
+
isPalette: {
|
|
325
|
+
type: 'boolean',
|
|
326
|
+
description: trans.__('Whether the command is called from the command palette')
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
}
|
|
305
330
|
}
|
|
306
331
|
});
|
|
307
332
|
commands.addCommand(CommandIDs.open, {
|
|
@@ -320,6 +345,18 @@ function addCommands(app, tracker, settingRegistry, translator, options) {
|
|
|
320
345
|
// Otherwise, create a new terminal with a given name.
|
|
321
346
|
return commands.execute(CommandIDs.createNew, { name });
|
|
322
347
|
}
|
|
348
|
+
},
|
|
349
|
+
describedBy: {
|
|
350
|
+
args: {
|
|
351
|
+
type: 'object',
|
|
352
|
+
properties: {
|
|
353
|
+
name: {
|
|
354
|
+
type: 'string',
|
|
355
|
+
description: trans.__('Terminal session name to open')
|
|
356
|
+
}
|
|
357
|
+
},
|
|
358
|
+
required: ['name']
|
|
359
|
+
}
|
|
323
360
|
}
|
|
324
361
|
});
|
|
325
362
|
commands.addCommand(CommandIDs.refresh, {
|
|
@@ -344,7 +381,18 @@ function addCommands(app, tracker, settingRegistry, translator, options) {
|
|
|
344
381
|
icon: args => args['isPalette']
|
|
345
382
|
? undefined
|
|
346
383
|
: refreshIcon.bindprops({ stylesheet: 'menuItem' }),
|
|
347
|
-
isEnabled
|
|
384
|
+
isEnabled,
|
|
385
|
+
describedBy: {
|
|
386
|
+
args: {
|
|
387
|
+
type: 'object',
|
|
388
|
+
properties: {
|
|
389
|
+
isPalette: {
|
|
390
|
+
type: 'boolean',
|
|
391
|
+
description: trans.__('Whether the command is called from the command palette')
|
|
392
|
+
}
|
|
393
|
+
}
|
|
394
|
+
}
|
|
395
|
+
}
|
|
348
396
|
});
|
|
349
397
|
/**
|
|
350
398
|
* Add copy command
|
|
@@ -376,7 +424,13 @@ function addCommands(app, tracker, settingRegistry, translator, options) {
|
|
|
376
424
|
return widget.hasSelection();
|
|
377
425
|
},
|
|
378
426
|
icon: copyIcon.bindprops({ stylesheet: 'menuItem' }),
|
|
379
|
-
label: trans.__('Copy')
|
|
427
|
+
label: trans.__('Copy'),
|
|
428
|
+
describedBy: {
|
|
429
|
+
args: {
|
|
430
|
+
type: 'object',
|
|
431
|
+
properties: {}
|
|
432
|
+
}
|
|
433
|
+
}
|
|
380
434
|
});
|
|
381
435
|
/**
|
|
382
436
|
* Add paste command
|
|
@@ -400,7 +454,13 @@ function addCommands(app, tracker, settingRegistry, translator, options) {
|
|
|
400
454
|
},
|
|
401
455
|
isEnabled: () => { var _a; return Boolean(isEnabled() && ((_a = tracker.currentWidget) === null || _a === void 0 ? void 0 : _a.content)); },
|
|
402
456
|
icon: pasteIcon.bindprops({ stylesheet: 'menuItem' }),
|
|
403
|
-
label: trans.__('Paste')
|
|
457
|
+
label: trans.__('Paste'),
|
|
458
|
+
describedBy: {
|
|
459
|
+
args: {
|
|
460
|
+
type: 'object',
|
|
461
|
+
properties: {}
|
|
462
|
+
}
|
|
463
|
+
}
|
|
404
464
|
});
|
|
405
465
|
commands.addCommand(CommandIDs.shutdown, {
|
|
406
466
|
label: trans.__('Shutdown Terminal'),
|
|
@@ -412,7 +472,13 @@ function addCommands(app, tracker, settingRegistry, translator, options) {
|
|
|
412
472
|
// The widget is automatically disposed upon session shutdown.
|
|
413
473
|
return current.content.session.shutdown();
|
|
414
474
|
},
|
|
415
|
-
isEnabled
|
|
475
|
+
isEnabled,
|
|
476
|
+
describedBy: {
|
|
477
|
+
args: {
|
|
478
|
+
type: 'object',
|
|
479
|
+
properties: {}
|
|
480
|
+
}
|
|
481
|
+
}
|
|
416
482
|
});
|
|
417
483
|
commands.addCommand(CommandIDs.increaseFont, {
|
|
418
484
|
label: trans.__('Increase Terminal Font Size'),
|
|
@@ -426,6 +492,12 @@ function addCommands(app, tracker, settingRegistry, translator, options) {
|
|
|
426
492
|
Private.showErrorMessage(err);
|
|
427
493
|
}
|
|
428
494
|
}
|
|
495
|
+
},
|
|
496
|
+
describedBy: {
|
|
497
|
+
args: {
|
|
498
|
+
type: 'object',
|
|
499
|
+
properties: {}
|
|
500
|
+
}
|
|
429
501
|
}
|
|
430
502
|
});
|
|
431
503
|
commands.addCommand(CommandIDs.decreaseFont, {
|
|
@@ -440,6 +512,12 @@ function addCommands(app, tracker, settingRegistry, translator, options) {
|
|
|
440
512
|
Private.showErrorMessage(err);
|
|
441
513
|
}
|
|
442
514
|
}
|
|
515
|
+
},
|
|
516
|
+
describedBy: {
|
|
517
|
+
args: {
|
|
518
|
+
type: 'object',
|
|
519
|
+
properties: {}
|
|
520
|
+
}
|
|
443
521
|
}
|
|
444
522
|
});
|
|
445
523
|
const themeDisplayedName = {
|
|
@@ -475,6 +553,23 @@ function addCommands(app, tracker, settingRegistry, translator, options) {
|
|
|
475
553
|
console.log(err);
|
|
476
554
|
Private.showErrorMessage(err);
|
|
477
555
|
}
|
|
556
|
+
},
|
|
557
|
+
describedBy: {
|
|
558
|
+
args: {
|
|
559
|
+
type: 'object',
|
|
560
|
+
properties: {
|
|
561
|
+
theme: {
|
|
562
|
+
type: 'string',
|
|
563
|
+
enum: ['inherit', 'light', 'dark'],
|
|
564
|
+
description: trans.__('Terminal theme to set')
|
|
565
|
+
},
|
|
566
|
+
isPalette: {
|
|
567
|
+
type: 'boolean',
|
|
568
|
+
description: 'Whether the command is called from the command palette'
|
|
569
|
+
}
|
|
570
|
+
},
|
|
571
|
+
required: ['theme']
|
|
572
|
+
}
|
|
478
573
|
}
|
|
479
574
|
});
|
|
480
575
|
// All commands with isEnabled defined directly or in a semantic commands
|
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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"}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
import { MainAreaWidget } from '@jupyterlab/apputils';
|
|
2
|
+
import { IReplaceOptions, ISearchProvider, SearchProvider } from '@jupyterlab/documentsearch';
|
|
3
|
+
import { Terminal } from '@jupyterlab/terminal';
|
|
4
|
+
import { ITranslator } from '@jupyterlab/translation';
|
|
5
|
+
import { Widget } from '@lumino/widgets';
|
|
6
|
+
export type TerminalWidget = MainAreaWidget<Terminal>;
|
|
7
|
+
/**
|
|
8
|
+
* Terminal search provider.
|
|
9
|
+
*/
|
|
10
|
+
export declare class TerminalSearchProvider extends SearchProvider<TerminalWidget> {
|
|
11
|
+
protected widget: TerminalWidget;
|
|
12
|
+
/**
|
|
13
|
+
* Constructor.
|
|
14
|
+
*
|
|
15
|
+
* @param widget The widget to search in.
|
|
16
|
+
*/
|
|
17
|
+
constructor(widget: TerminalWidget);
|
|
18
|
+
/**
|
|
19
|
+
* Create a search provider for the terminal widget.
|
|
20
|
+
*
|
|
21
|
+
* Note the widget provided is always checked using `isApplicable` before calling this
|
|
22
|
+
* function.
|
|
23
|
+
*
|
|
24
|
+
* @param widget The terminal widget to search in.
|
|
25
|
+
* @param translator [optional] The translator object.
|
|
26
|
+
*
|
|
27
|
+
* @returns The search provider for the terminal widget.
|
|
28
|
+
*/
|
|
29
|
+
static createNew(widget: TerminalWidget, translator?: ITranslator): ISearchProvider;
|
|
30
|
+
/**
|
|
31
|
+
* Report whether or not this provider has the ability to search on the given object.
|
|
32
|
+
*/
|
|
33
|
+
static isApplicable(domain: Widget): domain is TerminalWidget;
|
|
34
|
+
/**
|
|
35
|
+
* Clear currently highlighted match.
|
|
36
|
+
*/
|
|
37
|
+
clearHighlight(): Promise<void>;
|
|
38
|
+
/**
|
|
39
|
+
* The current index of the selected match.
|
|
40
|
+
*/
|
|
41
|
+
get currentMatchIndex(): number | null;
|
|
42
|
+
/**
|
|
43
|
+
* Stop a search and clear any internal state of the search provider.
|
|
44
|
+
*/
|
|
45
|
+
endQuery(): Promise<void>;
|
|
46
|
+
/**
|
|
47
|
+
* Highlight the next match.
|
|
48
|
+
*
|
|
49
|
+
* @returns The next match if available
|
|
50
|
+
*/
|
|
51
|
+
highlightNext(): Promise<undefined>;
|
|
52
|
+
/**
|
|
53
|
+
* Highlight the previous match.
|
|
54
|
+
*
|
|
55
|
+
* @returns The previous match if available.
|
|
56
|
+
*/
|
|
57
|
+
highlightPrevious(): Promise<undefined>;
|
|
58
|
+
/**
|
|
59
|
+
* The number of matches.
|
|
60
|
+
*/
|
|
61
|
+
get matchesCount(): number | null;
|
|
62
|
+
/**
|
|
63
|
+
* Replace the currently selected match with the provided text
|
|
64
|
+
* Not implemented in the terminal as it is read-only.
|
|
65
|
+
*
|
|
66
|
+
* @returns A promise that resolves once the action has completed.
|
|
67
|
+
*/
|
|
68
|
+
replaceCurrentMatch(newText: string, loop?: boolean, options?: IReplaceOptions): Promise<boolean>;
|
|
69
|
+
/**
|
|
70
|
+
* Replace all matches in the widget with the provided text
|
|
71
|
+
* Not implemented in the terminal as it is read-only.
|
|
72
|
+
*
|
|
73
|
+
* @returns A promise that resolves once the action has completed.
|
|
74
|
+
*/
|
|
75
|
+
replaceAllMatches(newText: string, options?: IReplaceOptions): Promise<boolean>;
|
|
76
|
+
/**
|
|
77
|
+
* Start a search using the provided query.
|
|
78
|
+
*
|
|
79
|
+
* @param query A RegExp to be use to perform the search
|
|
80
|
+
*/
|
|
81
|
+
startQuery(query: RegExp): Promise<void>;
|
|
82
|
+
/**
|
|
83
|
+
* Clear current search.
|
|
84
|
+
*/
|
|
85
|
+
private _clear;
|
|
86
|
+
/**
|
|
87
|
+
* Convert a color to the '#rrggbb' format expected by xtermjs SearchAddon.
|
|
88
|
+
*
|
|
89
|
+
* @param color Color to convert.
|
|
90
|
+
* @param backgroundColor Background color to mix with `color` if it is not opaque.
|
|
91
|
+
* @returns Color string of form '#rrggbb'
|
|
92
|
+
*/
|
|
93
|
+
private _colorToRRGGBB;
|
|
94
|
+
private _next;
|
|
95
|
+
/**
|
|
96
|
+
* Update cached xtermjs search decoration options following a theme change.
|
|
97
|
+
* If a search is currently displayed, rerun it to update the colors.
|
|
98
|
+
*/
|
|
99
|
+
private _onThemeChanged;
|
|
100
|
+
private _previous;
|
|
101
|
+
/**
|
|
102
|
+
* Return xtermjs search options based on regex query flags and theme colors.
|
|
103
|
+
*
|
|
104
|
+
* @param flags Regex query flags.
|
|
105
|
+
*
|
|
106
|
+
* @returns xtermjs search options.
|
|
107
|
+
*/
|
|
108
|
+
private _searchOptions;
|
|
109
|
+
readonly isReadOnly = true;
|
|
110
|
+
private _query?;
|
|
111
|
+
private _currentMatchIndex;
|
|
112
|
+
private _matchesCount;
|
|
113
|
+
private _searchDecorationOptions?;
|
|
114
|
+
}
|
|
@@ -0,0 +1,209 @@
|
|
|
1
|
+
// Copyright (c) Jupyter Development Team.
|
|
2
|
+
// Distributed under the terms of the Modified BSD License.
|
|
3
|
+
import { MainAreaWidget } from '@jupyterlab/apputils';
|
|
4
|
+
import { SearchProvider } from '@jupyterlab/documentsearch';
|
|
5
|
+
import { Terminal } from '@jupyterlab/terminal';
|
|
6
|
+
import Color from 'color';
|
|
7
|
+
/**
|
|
8
|
+
* Terminal search provider.
|
|
9
|
+
*/
|
|
10
|
+
export class TerminalSearchProvider extends SearchProvider {
|
|
11
|
+
/**
|
|
12
|
+
* Constructor.
|
|
13
|
+
*
|
|
14
|
+
* @param widget The widget to search in.
|
|
15
|
+
*/
|
|
16
|
+
constructor(widget) {
|
|
17
|
+
super(widget);
|
|
18
|
+
this.widget = widget;
|
|
19
|
+
this.isReadOnly = true;
|
|
20
|
+
this._currentMatchIndex = null;
|
|
21
|
+
this._matchesCount = null;
|
|
22
|
+
const terminal = this.widget.content;
|
|
23
|
+
terminal.searchAddon.onDidChangeResults(event => {
|
|
24
|
+
const { resultCount, resultIndex } = event;
|
|
25
|
+
this._currentMatchIndex = resultCount > 0 ? resultIndex : null;
|
|
26
|
+
this._matchesCount = resultCount > 0 ? resultCount : null;
|
|
27
|
+
});
|
|
28
|
+
terminal.themeChanged.connect(() => {
|
|
29
|
+
this._onThemeChanged();
|
|
30
|
+
});
|
|
31
|
+
// Get initial theme colors.
|
|
32
|
+
this._onThemeChanged();
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Create a search provider for the terminal widget.
|
|
36
|
+
*
|
|
37
|
+
* Note the widget provided is always checked using `isApplicable` before calling this
|
|
38
|
+
* function.
|
|
39
|
+
*
|
|
40
|
+
* @param widget The terminal widget to search in.
|
|
41
|
+
* @param translator [optional] The translator object.
|
|
42
|
+
*
|
|
43
|
+
* @returns The search provider for the terminal widget.
|
|
44
|
+
*/
|
|
45
|
+
static createNew(widget, translator) {
|
|
46
|
+
return new TerminalSearchProvider(widget);
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Report whether or not this provider has the ability to search on the given object.
|
|
50
|
+
*/
|
|
51
|
+
static isApplicable(domain) {
|
|
52
|
+
return (domain instanceof MainAreaWidget && domain.content instanceof Terminal);
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* Clear currently highlighted match.
|
|
56
|
+
*/
|
|
57
|
+
async clearHighlight() {
|
|
58
|
+
this._clear();
|
|
59
|
+
return Promise.resolve();
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* The current index of the selected match.
|
|
63
|
+
*/
|
|
64
|
+
get currentMatchIndex() {
|
|
65
|
+
return this._currentMatchIndex;
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Stop a search and clear any internal state of the search provider.
|
|
69
|
+
*/
|
|
70
|
+
async endQuery() {
|
|
71
|
+
this._clear();
|
|
72
|
+
return Promise.resolve();
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Highlight the next match.
|
|
76
|
+
*
|
|
77
|
+
* @returns The next match if available
|
|
78
|
+
*/
|
|
79
|
+
async highlightNext() {
|
|
80
|
+
this._next();
|
|
81
|
+
return Promise.resolve(undefined);
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* Highlight the previous match.
|
|
85
|
+
*
|
|
86
|
+
* @returns The previous match if available.
|
|
87
|
+
*/
|
|
88
|
+
async highlightPrevious() {
|
|
89
|
+
this._previous();
|
|
90
|
+
return Promise.resolve(undefined);
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* The number of matches.
|
|
94
|
+
*/
|
|
95
|
+
get matchesCount() {
|
|
96
|
+
return this._matchesCount;
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
* Replace the currently selected match with the provided text
|
|
100
|
+
* Not implemented in the terminal as it is read-only.
|
|
101
|
+
*
|
|
102
|
+
* @returns A promise that resolves once the action has completed.
|
|
103
|
+
*/
|
|
104
|
+
async replaceCurrentMatch(newText, loop, options) {
|
|
105
|
+
return Promise.resolve(false);
|
|
106
|
+
}
|
|
107
|
+
/**
|
|
108
|
+
* Replace all matches in the widget with the provided text
|
|
109
|
+
* Not implemented in the terminal as it is read-only.
|
|
110
|
+
*
|
|
111
|
+
* @returns A promise that resolves once the action has completed.
|
|
112
|
+
*/
|
|
113
|
+
async replaceAllMatches(newText, options) {
|
|
114
|
+
return Promise.resolve(false);
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Start a search using the provided query.
|
|
118
|
+
*
|
|
119
|
+
* @param query A RegExp to be use to perform the search
|
|
120
|
+
*/
|
|
121
|
+
async startQuery(query) {
|
|
122
|
+
this._query = query;
|
|
123
|
+
this._next();
|
|
124
|
+
return Promise.resolve();
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* Clear current search.
|
|
128
|
+
*/
|
|
129
|
+
_clear() {
|
|
130
|
+
this._query = undefined;
|
|
131
|
+
this._currentMatchIndex = null;
|
|
132
|
+
this._matchesCount = null;
|
|
133
|
+
this.widget.content.searchAddon.clearDecorations();
|
|
134
|
+
}
|
|
135
|
+
/**
|
|
136
|
+
* Convert a color to the '#rrggbb' format expected by xtermjs SearchAddon.
|
|
137
|
+
*
|
|
138
|
+
* @param color Color to convert.
|
|
139
|
+
* @param backgroundColor Background color to mix with `color` if it is not opaque.
|
|
140
|
+
* @returns Color string of form '#rrggbb'
|
|
141
|
+
*/
|
|
142
|
+
_colorToRRGGBB(color, backgroundColor) {
|
|
143
|
+
try {
|
|
144
|
+
let converted = Color(color);
|
|
145
|
+
const alpha = converted.alpha();
|
|
146
|
+
if (alpha < 1) {
|
|
147
|
+
converted = converted.mix(Color(backgroundColor), alpha);
|
|
148
|
+
}
|
|
149
|
+
return converted.hex();
|
|
150
|
+
}
|
|
151
|
+
catch (e) {
|
|
152
|
+
// Return a valid color rather than propagate exception.
|
|
153
|
+
return '#888888';
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
_next() {
|
|
157
|
+
if (this._query !== undefined) {
|
|
158
|
+
const { flags, source } = this._query;
|
|
159
|
+
this.widget.content.searchAddon.findNext(source, this._searchOptions(flags));
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
/**
|
|
163
|
+
* Update cached xtermjs search decoration options following a theme change.
|
|
164
|
+
* If a search is currently displayed, rerun it to update the colors.
|
|
165
|
+
*/
|
|
166
|
+
_onThemeChanged() {
|
|
167
|
+
const theme = this.widget.content.getXTermTheme();
|
|
168
|
+
const { background } = theme;
|
|
169
|
+
const activeMatchBackground = this._colorToRRGGBB(theme.activeMatchBackground, background);
|
|
170
|
+
// matchBackground uses the theme's selectionBackground.
|
|
171
|
+
const matchBackground = this._colorToRRGGBB(theme.selectionBackground, background);
|
|
172
|
+
this._searchDecorationOptions = {
|
|
173
|
+
// The following two need to be in string #rrggbb format to be acceptable to xtermjs.
|
|
174
|
+
activeMatchBackground,
|
|
175
|
+
matchBackground,
|
|
176
|
+
// The following two are compulsory so they need to be set but we do not use them.
|
|
177
|
+
matchOverviewRuler: '',
|
|
178
|
+
activeMatchColorOverviewRuler: ''
|
|
179
|
+
};
|
|
180
|
+
if (this._query !== undefined) {
|
|
181
|
+
// To update the displayed search colors, need to remove colors and rerun the search.
|
|
182
|
+
this.widget.content.searchAddon.clearDecorations();
|
|
183
|
+
this._next();
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
_previous() {
|
|
187
|
+
if (this._query !== undefined) {
|
|
188
|
+
const { flags, source } = this._query;
|
|
189
|
+
this.widget.content.searchAddon.findPrevious(source, this._searchOptions(flags));
|
|
190
|
+
}
|
|
191
|
+
}
|
|
192
|
+
/**
|
|
193
|
+
* Return xtermjs search options based on regex query flags and theme colors.
|
|
194
|
+
*
|
|
195
|
+
* @param flags Regex query flags.
|
|
196
|
+
*
|
|
197
|
+
* @returns xtermjs search options.
|
|
198
|
+
*/
|
|
199
|
+
_searchOptions(flags) {
|
|
200
|
+
return {
|
|
201
|
+
caseSensitive: !flags.includes('i'),
|
|
202
|
+
incremental: false,
|
|
203
|
+
regex: true,
|
|
204
|
+
wholeWord: false, // Dealt with by regex
|
|
205
|
+
decorations: this._searchDecorationOptions
|
|
206
|
+
};
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
//# sourceMappingURL=searchprovider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"searchprovider.js","sourceRoot":"","sources":["../src/searchprovider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/terminal-extension",
|
|
3
|
-
"version": "4.5.0-alpha.
|
|
3
|
+
"version": "4.5.0-alpha.3",
|
|
4
4
|
"description": "JupyterLab - Terminal Emulator Extension",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -37,17 +37,20 @@
|
|
|
37
37
|
"watch": "tsc -b --watch"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@jupyterlab/application": "^4.5.0-alpha.
|
|
41
|
-
"@jupyterlab/apputils": "^4.6.0-alpha.
|
|
42
|
-
"@jupyterlab/
|
|
43
|
-
"@jupyterlab/
|
|
44
|
-
"@jupyterlab/
|
|
45
|
-
"@jupyterlab/
|
|
46
|
-
"@jupyterlab/
|
|
47
|
-
"@jupyterlab/
|
|
48
|
-
"@jupyterlab/
|
|
49
|
-
"@jupyterlab/
|
|
50
|
-
"@
|
|
40
|
+
"@jupyterlab/application": "^4.5.0-alpha.3",
|
|
41
|
+
"@jupyterlab/apputils": "^4.6.0-alpha.3",
|
|
42
|
+
"@jupyterlab/documentsearch": "^4.5.0-alpha.3",
|
|
43
|
+
"@jupyterlab/launcher": "^4.5.0-alpha.3",
|
|
44
|
+
"@jupyterlab/mainmenu": "^4.5.0-alpha.3",
|
|
45
|
+
"@jupyterlab/running": "^4.5.0-alpha.3",
|
|
46
|
+
"@jupyterlab/services": "^7.5.0-alpha.3",
|
|
47
|
+
"@jupyterlab/settingregistry": "^4.5.0-alpha.3",
|
|
48
|
+
"@jupyterlab/terminal": "^4.5.0-alpha.3",
|
|
49
|
+
"@jupyterlab/translation": "^4.5.0-alpha.3",
|
|
50
|
+
"@jupyterlab/ui-components": "^4.5.0-alpha.3",
|
|
51
|
+
"@lumino/widgets": "^2.7.1",
|
|
52
|
+
"@xterm/addon-search": "~0.15.0",
|
|
53
|
+
"color": "^5.0.0"
|
|
51
54
|
},
|
|
52
55
|
"devDependencies": {
|
|
53
56
|
"@types/webpack-env": "^1.18.0",
|
package/src/index.ts
CHANGED
|
@@ -17,6 +17,7 @@ import {
|
|
|
17
17
|
MainAreaWidget,
|
|
18
18
|
WidgetTracker
|
|
19
19
|
} from '@jupyterlab/apputils';
|
|
20
|
+
import { ISearchProviderRegistry } from '@jupyterlab/documentsearch';
|
|
20
21
|
import { ILauncher } from '@jupyterlab/launcher';
|
|
21
22
|
import { IMainMenu } from '@jupyterlab/mainmenu';
|
|
22
23
|
import { IRunningSessionManagers, IRunningSessions } from '@jupyterlab/running';
|
|
@@ -35,6 +36,7 @@ import {
|
|
|
35
36
|
terminalIcon
|
|
36
37
|
} from '@jupyterlab/ui-components';
|
|
37
38
|
import { Menu, Widget } from '@lumino/widgets';
|
|
39
|
+
import { TerminalSearchProvider } from './searchprovider';
|
|
38
40
|
|
|
39
41
|
/**
|
|
40
42
|
* The command IDs used by the terminal plugin.
|
|
@@ -74,7 +76,8 @@ const plugin: JupyterFrontEndPlugin<ITerminalTracker> = {
|
|
|
74
76
|
ILayoutRestorer,
|
|
75
77
|
IMainMenu,
|
|
76
78
|
IThemeManager,
|
|
77
|
-
IRunningSessionManagers
|
|
79
|
+
IRunningSessionManagers,
|
|
80
|
+
ISearchProviderRegistry
|
|
78
81
|
],
|
|
79
82
|
autoStart: true
|
|
80
83
|
};
|
|
@@ -96,7 +99,8 @@ function activate(
|
|
|
96
99
|
restorer: ILayoutRestorer | null,
|
|
97
100
|
mainMenu: IMainMenu | null,
|
|
98
101
|
themeManager: IThemeManager | null,
|
|
99
|
-
runningSessionManagers: IRunningSessionManagers | null
|
|
102
|
+
runningSessionManagers: IRunningSessionManagers | null,
|
|
103
|
+
searchRegistry: ISearchProviderRegistry | null
|
|
100
104
|
): ITerminalTracker {
|
|
101
105
|
const trans = translator.load('jupyterlab');
|
|
102
106
|
const { serviceManager, commands } = app;
|
|
@@ -278,6 +282,10 @@ function activate(
|
|
|
278
282
|
addRunningSessionManager(runningSessionManagers, app, translator);
|
|
279
283
|
}
|
|
280
284
|
|
|
285
|
+
if (searchRegistry) {
|
|
286
|
+
searchRegistry.add('terminal', TerminalSearchProvider);
|
|
287
|
+
}
|
|
288
|
+
|
|
281
289
|
return tracker;
|
|
282
290
|
}
|
|
283
291
|
|
|
@@ -391,6 +399,27 @@ function addCommands(
|
|
|
391
399
|
void tracker.add(main);
|
|
392
400
|
app.shell.activateById(main.id);
|
|
393
401
|
return main;
|
|
402
|
+
},
|
|
403
|
+
describedBy: {
|
|
404
|
+
args: {
|
|
405
|
+
type: 'object',
|
|
406
|
+
properties: {
|
|
407
|
+
name: {
|
|
408
|
+
type: 'string',
|
|
409
|
+
description: trans.__('Terminal session name')
|
|
410
|
+
},
|
|
411
|
+
cwd: {
|
|
412
|
+
type: 'string',
|
|
413
|
+
description: trans.__('Current working directory for the terminal')
|
|
414
|
+
},
|
|
415
|
+
isPalette: {
|
|
416
|
+
type: 'boolean',
|
|
417
|
+
description: trans.__(
|
|
418
|
+
'Whether the command is called from the command palette'
|
|
419
|
+
)
|
|
420
|
+
}
|
|
421
|
+
}
|
|
422
|
+
}
|
|
394
423
|
}
|
|
395
424
|
});
|
|
396
425
|
|
|
@@ -409,6 +438,18 @@ function addCommands(
|
|
|
409
438
|
// Otherwise, create a new terminal with a given name.
|
|
410
439
|
return commands.execute(CommandIDs.createNew, { name });
|
|
411
440
|
}
|
|
441
|
+
},
|
|
442
|
+
describedBy: {
|
|
443
|
+
args: {
|
|
444
|
+
type: 'object',
|
|
445
|
+
properties: {
|
|
446
|
+
name: {
|
|
447
|
+
type: 'string',
|
|
448
|
+
description: trans.__('Terminal session name to open')
|
|
449
|
+
}
|
|
450
|
+
},
|
|
451
|
+
required: ['name']
|
|
452
|
+
}
|
|
412
453
|
}
|
|
413
454
|
});
|
|
414
455
|
|
|
@@ -434,7 +475,20 @@ function addCommands(
|
|
|
434
475
|
args['isPalette']
|
|
435
476
|
? undefined
|
|
436
477
|
: refreshIcon.bindprops({ stylesheet: 'menuItem' }),
|
|
437
|
-
isEnabled
|
|
478
|
+
isEnabled,
|
|
479
|
+
describedBy: {
|
|
480
|
+
args: {
|
|
481
|
+
type: 'object',
|
|
482
|
+
properties: {
|
|
483
|
+
isPalette: {
|
|
484
|
+
type: 'boolean',
|
|
485
|
+
description: trans.__(
|
|
486
|
+
'Whether the command is called from the command palette'
|
|
487
|
+
)
|
|
488
|
+
}
|
|
489
|
+
}
|
|
490
|
+
}
|
|
491
|
+
}
|
|
438
492
|
});
|
|
439
493
|
|
|
440
494
|
/**
|
|
@@ -471,7 +525,13 @@ function addCommands(
|
|
|
471
525
|
return widget.hasSelection();
|
|
472
526
|
},
|
|
473
527
|
icon: copyIcon.bindprops({ stylesheet: 'menuItem' }),
|
|
474
|
-
label: trans.__('Copy')
|
|
528
|
+
label: trans.__('Copy'),
|
|
529
|
+
describedBy: {
|
|
530
|
+
args: {
|
|
531
|
+
type: 'object',
|
|
532
|
+
properties: {}
|
|
533
|
+
}
|
|
534
|
+
}
|
|
475
535
|
});
|
|
476
536
|
|
|
477
537
|
/**
|
|
@@ -498,7 +558,13 @@ function addCommands(
|
|
|
498
558
|
},
|
|
499
559
|
isEnabled: () => Boolean(isEnabled() && tracker.currentWidget?.content),
|
|
500
560
|
icon: pasteIcon.bindprops({ stylesheet: 'menuItem' }),
|
|
501
|
-
label: trans.__('Paste')
|
|
561
|
+
label: trans.__('Paste'),
|
|
562
|
+
describedBy: {
|
|
563
|
+
args: {
|
|
564
|
+
type: 'object',
|
|
565
|
+
properties: {}
|
|
566
|
+
}
|
|
567
|
+
}
|
|
502
568
|
});
|
|
503
569
|
|
|
504
570
|
commands.addCommand(CommandIDs.shutdown, {
|
|
@@ -512,7 +578,13 @@ function addCommands(
|
|
|
512
578
|
// The widget is automatically disposed upon session shutdown.
|
|
513
579
|
return current.content.session.shutdown();
|
|
514
580
|
},
|
|
515
|
-
isEnabled
|
|
581
|
+
isEnabled,
|
|
582
|
+
describedBy: {
|
|
583
|
+
args: {
|
|
584
|
+
type: 'object',
|
|
585
|
+
properties: {}
|
|
586
|
+
}
|
|
587
|
+
}
|
|
516
588
|
});
|
|
517
589
|
|
|
518
590
|
commands.addCommand(CommandIDs.increaseFont, {
|
|
@@ -526,6 +598,12 @@ function addCommands(
|
|
|
526
598
|
Private.showErrorMessage(err);
|
|
527
599
|
}
|
|
528
600
|
}
|
|
601
|
+
},
|
|
602
|
+
describedBy: {
|
|
603
|
+
args: {
|
|
604
|
+
type: 'object',
|
|
605
|
+
properties: {}
|
|
606
|
+
}
|
|
529
607
|
}
|
|
530
608
|
});
|
|
531
609
|
|
|
@@ -540,6 +618,12 @@ function addCommands(
|
|
|
540
618
|
Private.showErrorMessage(err);
|
|
541
619
|
}
|
|
542
620
|
}
|
|
621
|
+
},
|
|
622
|
+
describedBy: {
|
|
623
|
+
args: {
|
|
624
|
+
type: 'object',
|
|
625
|
+
properties: {}
|
|
626
|
+
}
|
|
543
627
|
}
|
|
544
628
|
});
|
|
545
629
|
|
|
@@ -577,6 +661,24 @@ function addCommands(
|
|
|
577
661
|
console.log(err);
|
|
578
662
|
Private.showErrorMessage(err);
|
|
579
663
|
}
|
|
664
|
+
},
|
|
665
|
+
describedBy: {
|
|
666
|
+
args: {
|
|
667
|
+
type: 'object',
|
|
668
|
+
properties: {
|
|
669
|
+
theme: {
|
|
670
|
+
type: 'string',
|
|
671
|
+
enum: ['inherit', 'light', 'dark'],
|
|
672
|
+
description: trans.__('Terminal theme to set')
|
|
673
|
+
},
|
|
674
|
+
isPalette: {
|
|
675
|
+
type: 'boolean',
|
|
676
|
+
description:
|
|
677
|
+
'Whether the command is called from the command palette'
|
|
678
|
+
}
|
|
679
|
+
},
|
|
680
|
+
required: ['theme']
|
|
681
|
+
}
|
|
580
682
|
}
|
|
581
683
|
});
|
|
582
684
|
|
|
@@ -0,0 +1,272 @@
|
|
|
1
|
+
// Copyright (c) Jupyter Development Team.
|
|
2
|
+
// Distributed under the terms of the Modified BSD License.
|
|
3
|
+
|
|
4
|
+
import { MainAreaWidget } from '@jupyterlab/apputils';
|
|
5
|
+
import {
|
|
6
|
+
IReplaceOptions,
|
|
7
|
+
ISearchProvider,
|
|
8
|
+
SearchProvider
|
|
9
|
+
} from '@jupyterlab/documentsearch';
|
|
10
|
+
import { Terminal } from '@jupyterlab/terminal';
|
|
11
|
+
import { ITranslator } from '@jupyterlab/translation';
|
|
12
|
+
import { Widget } from '@lumino/widgets';
|
|
13
|
+
import type {
|
|
14
|
+
ISearchDecorationOptions,
|
|
15
|
+
ISearchOptions
|
|
16
|
+
} from '@xterm/addon-search';
|
|
17
|
+
import Color from 'color';
|
|
18
|
+
|
|
19
|
+
// The type for which isApplicable returns true
|
|
20
|
+
export type TerminalWidget = MainAreaWidget<Terminal>;
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Terminal search provider.
|
|
24
|
+
*/
|
|
25
|
+
export class TerminalSearchProvider extends SearchProvider<TerminalWidget> {
|
|
26
|
+
/**
|
|
27
|
+
* Constructor.
|
|
28
|
+
*
|
|
29
|
+
* @param widget The widget to search in.
|
|
30
|
+
*/
|
|
31
|
+
constructor(protected widget: TerminalWidget) {
|
|
32
|
+
super(widget);
|
|
33
|
+
|
|
34
|
+
const terminal = this.widget.content;
|
|
35
|
+
|
|
36
|
+
terminal.searchAddon.onDidChangeResults(event => {
|
|
37
|
+
const { resultCount, resultIndex } = event;
|
|
38
|
+
this._currentMatchIndex = resultCount > 0 ? resultIndex : null;
|
|
39
|
+
this._matchesCount = resultCount > 0 ? resultCount : null;
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
terminal.themeChanged.connect(() => {
|
|
43
|
+
this._onThemeChanged();
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
// Get initial theme colors.
|
|
47
|
+
this._onThemeChanged();
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Create a search provider for the terminal widget.
|
|
52
|
+
*
|
|
53
|
+
* Note the widget provided is always checked using `isApplicable` before calling this
|
|
54
|
+
* function.
|
|
55
|
+
*
|
|
56
|
+
* @param widget The terminal widget to search in.
|
|
57
|
+
* @param translator [optional] The translator object.
|
|
58
|
+
*
|
|
59
|
+
* @returns The search provider for the terminal widget.
|
|
60
|
+
*/
|
|
61
|
+
static createNew(
|
|
62
|
+
widget: TerminalWidget,
|
|
63
|
+
translator?: ITranslator
|
|
64
|
+
): ISearchProvider {
|
|
65
|
+
return new TerminalSearchProvider(widget);
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Report whether or not this provider has the ability to search on the given object.
|
|
70
|
+
*/
|
|
71
|
+
static isApplicable(domain: Widget): domain is TerminalWidget {
|
|
72
|
+
return (
|
|
73
|
+
domain instanceof MainAreaWidget && domain.content instanceof Terminal
|
|
74
|
+
);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* Clear currently highlighted match.
|
|
79
|
+
*/
|
|
80
|
+
async clearHighlight(): Promise<void> {
|
|
81
|
+
this._clear();
|
|
82
|
+
return Promise.resolve();
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* The current index of the selected match.
|
|
87
|
+
*/
|
|
88
|
+
get currentMatchIndex(): number | null {
|
|
89
|
+
return this._currentMatchIndex;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/**
|
|
93
|
+
* Stop a search and clear any internal state of the search provider.
|
|
94
|
+
*/
|
|
95
|
+
async endQuery(): Promise<void> {
|
|
96
|
+
this._clear();
|
|
97
|
+
return Promise.resolve();
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
/**
|
|
101
|
+
* Highlight the next match.
|
|
102
|
+
*
|
|
103
|
+
* @returns The next match if available
|
|
104
|
+
*/
|
|
105
|
+
async highlightNext(): Promise<undefined> {
|
|
106
|
+
this._next();
|
|
107
|
+
return Promise.resolve(undefined);
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* Highlight the previous match.
|
|
112
|
+
*
|
|
113
|
+
* @returns The previous match if available.
|
|
114
|
+
*/
|
|
115
|
+
async highlightPrevious(): Promise<undefined> {
|
|
116
|
+
this._previous();
|
|
117
|
+
return Promise.resolve(undefined);
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/**
|
|
121
|
+
* The number of matches.
|
|
122
|
+
*/
|
|
123
|
+
get matchesCount(): number | null {
|
|
124
|
+
return this._matchesCount;
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
/**
|
|
128
|
+
* Replace the currently selected match with the provided text
|
|
129
|
+
* Not implemented in the terminal as it is read-only.
|
|
130
|
+
*
|
|
131
|
+
* @returns A promise that resolves once the action has completed.
|
|
132
|
+
*/
|
|
133
|
+
async replaceCurrentMatch(
|
|
134
|
+
newText: string,
|
|
135
|
+
loop?: boolean,
|
|
136
|
+
options?: IReplaceOptions
|
|
137
|
+
): Promise<boolean> {
|
|
138
|
+
return Promise.resolve(false);
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
/**
|
|
142
|
+
* Replace all matches in the widget with the provided text
|
|
143
|
+
* Not implemented in the terminal as it is read-only.
|
|
144
|
+
*
|
|
145
|
+
* @returns A promise that resolves once the action has completed.
|
|
146
|
+
*/
|
|
147
|
+
async replaceAllMatches(
|
|
148
|
+
newText: string,
|
|
149
|
+
options?: IReplaceOptions
|
|
150
|
+
): Promise<boolean> {
|
|
151
|
+
return Promise.resolve(false);
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
/**
|
|
155
|
+
* Start a search using the provided query.
|
|
156
|
+
*
|
|
157
|
+
* @param query A RegExp to be use to perform the search
|
|
158
|
+
*/
|
|
159
|
+
async startQuery(query: RegExp): Promise<void> {
|
|
160
|
+
this._query = query;
|
|
161
|
+
this._next();
|
|
162
|
+
return Promise.resolve();
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
/**
|
|
166
|
+
* Clear current search.
|
|
167
|
+
*/
|
|
168
|
+
private _clear(): void {
|
|
169
|
+
this._query = undefined;
|
|
170
|
+
this._currentMatchIndex = null;
|
|
171
|
+
this._matchesCount = null;
|
|
172
|
+
this.widget.content.searchAddon.clearDecorations();
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
/**
|
|
176
|
+
* Convert a color to the '#rrggbb' format expected by xtermjs SearchAddon.
|
|
177
|
+
*
|
|
178
|
+
* @param color Color to convert.
|
|
179
|
+
* @param backgroundColor Background color to mix with `color` if it is not opaque.
|
|
180
|
+
* @returns Color string of form '#rrggbb'
|
|
181
|
+
*/
|
|
182
|
+
private _colorToRRGGBB(color: string, backgroundColor: string): string {
|
|
183
|
+
try {
|
|
184
|
+
let converted = Color(color);
|
|
185
|
+
const alpha = converted.alpha();
|
|
186
|
+
if (alpha < 1) {
|
|
187
|
+
converted = converted.mix(Color(backgroundColor), alpha);
|
|
188
|
+
}
|
|
189
|
+
return converted.hex();
|
|
190
|
+
} catch (e) {
|
|
191
|
+
// Return a valid color rather than propagate exception.
|
|
192
|
+
return '#888888';
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
private _next(): void {
|
|
197
|
+
if (this._query !== undefined) {
|
|
198
|
+
const { flags, source } = this._query;
|
|
199
|
+
this.widget.content.searchAddon.findNext(
|
|
200
|
+
source,
|
|
201
|
+
this._searchOptions(flags)
|
|
202
|
+
);
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
/**
|
|
207
|
+
* Update cached xtermjs search decoration options following a theme change.
|
|
208
|
+
* If a search is currently displayed, rerun it to update the colors.
|
|
209
|
+
*/
|
|
210
|
+
private _onThemeChanged() {
|
|
211
|
+
const theme = this.widget.content.getXTermTheme();
|
|
212
|
+
const { background } = theme;
|
|
213
|
+
const activeMatchBackground = this._colorToRRGGBB(
|
|
214
|
+
theme.activeMatchBackground,
|
|
215
|
+
background
|
|
216
|
+
);
|
|
217
|
+
// matchBackground uses the theme's selectionBackground.
|
|
218
|
+
const matchBackground = this._colorToRRGGBB(
|
|
219
|
+
theme.selectionBackground,
|
|
220
|
+
background
|
|
221
|
+
);
|
|
222
|
+
|
|
223
|
+
this._searchDecorationOptions = {
|
|
224
|
+
// The following two need to be in string #rrggbb format to be acceptable to xtermjs.
|
|
225
|
+
activeMatchBackground,
|
|
226
|
+
matchBackground,
|
|
227
|
+
// The following two are compulsory so they need to be set but we do not use them.
|
|
228
|
+
matchOverviewRuler: '',
|
|
229
|
+
activeMatchColorOverviewRuler: ''
|
|
230
|
+
};
|
|
231
|
+
|
|
232
|
+
if (this._query !== undefined) {
|
|
233
|
+
// To update the displayed search colors, need to remove colors and rerun the search.
|
|
234
|
+
this.widget.content.searchAddon.clearDecorations();
|
|
235
|
+
this._next();
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
private _previous(): void {
|
|
240
|
+
if (this._query !== undefined) {
|
|
241
|
+
const { flags, source } = this._query;
|
|
242
|
+
this.widget.content.searchAddon.findPrevious(
|
|
243
|
+
source,
|
|
244
|
+
this._searchOptions(flags)
|
|
245
|
+
);
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
/**
|
|
250
|
+
* Return xtermjs search options based on regex query flags and theme colors.
|
|
251
|
+
*
|
|
252
|
+
* @param flags Regex query flags.
|
|
253
|
+
*
|
|
254
|
+
* @returns xtermjs search options.
|
|
255
|
+
*/
|
|
256
|
+
private _searchOptions(flags: string): ISearchOptions {
|
|
257
|
+
return {
|
|
258
|
+
caseSensitive: !flags.includes('i'),
|
|
259
|
+
incremental: false,
|
|
260
|
+
regex: true,
|
|
261
|
+
wholeWord: false, // Dealt with by regex
|
|
262
|
+
decorations: this._searchDecorationOptions
|
|
263
|
+
};
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
readonly isReadOnly = true;
|
|
267
|
+
|
|
268
|
+
private _query?: RegExp;
|
|
269
|
+
private _currentMatchIndex: number | null = null;
|
|
270
|
+
private _matchesCount: number | null = null;
|
|
271
|
+
private _searchDecorationOptions?: ISearchDecorationOptions;
|
|
272
|
+
}
|
package/style/index.css
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
@import url('~@jupyterlab/ui-components/style/index.css');
|
|
9
9
|
@import url('~@jupyterlab/apputils/style/index.css');
|
|
10
10
|
@import url('~@jupyterlab/application/style/index.css');
|
|
11
|
+
@import url('~@jupyterlab/documentsearch/style/index.css');
|
|
11
12
|
@import url('~@jupyterlab/launcher/style/index.css');
|
|
12
13
|
@import url('~@jupyterlab/mainmenu/style/index.css');
|
|
13
14
|
@import url('~@jupyterlab/running/style/index.css');
|
package/style/index.js
CHANGED
|
@@ -8,6 +8,7 @@ import '@lumino/widgets/style/index.js';
|
|
|
8
8
|
import '@jupyterlab/ui-components/style/index.js';
|
|
9
9
|
import '@jupyterlab/apputils/style/index.js';
|
|
10
10
|
import '@jupyterlab/application/style/index.js';
|
|
11
|
+
import '@jupyterlab/documentsearch/style/index.js';
|
|
11
12
|
import '@jupyterlab/launcher/style/index.js';
|
|
12
13
|
import '@jupyterlab/mainmenu/style/index.js';
|
|
13
14
|
import '@jupyterlab/running/style/index.js';
|