@deephaven/console 0.21.2-dhe-vite.5 → 0.22.0
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/dist/ConsoleShortcuts.d.ts +2 -0
- package/dist/ConsoleShortcuts.d.ts.map +1 -1
- package/dist/ConsoleShortcuts.js +12 -0
- package/dist/ConsoleShortcuts.js.map +1 -1
- package/dist/notebook/Editor.d.ts +1 -1
- package/dist/notebook/Editor.d.ts.map +1 -1
- package/dist/notebook/Editor.js +1 -1
- package/dist/notebook/Editor.js.map +1 -1
- package/dist/notebook/ScriptEditor.d.ts +6 -7
- package/dist/notebook/ScriptEditor.d.ts.map +1 -1
- package/dist/notebook/ScriptEditor.js +15 -5
- package/dist/notebook/ScriptEditor.js.map +1 -1
- package/package.json +13 -21
|
@@ -16,6 +16,8 @@ declare const SHORTCUTS: {
|
|
|
16
16
|
RUN: import("@deephaven/components").Shortcut;
|
|
17
17
|
RUN_SELECTED: import("@deephaven/components").Shortcut;
|
|
18
18
|
FIND: import("@deephaven/components").Shortcut;
|
|
19
|
+
MINIMAP: import("@deephaven/components").Shortcut;
|
|
20
|
+
WORDWRAP: import("@deephaven/components").Shortcut;
|
|
19
21
|
};
|
|
20
22
|
};
|
|
21
23
|
export default SHORTCUTS;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsoleShortcuts.d.ts","sourceRoot":"","sources":["../src/ConsoleShortcuts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ConsoleShortcuts.d.ts","sourceRoot":"","sources":["../src/ConsoleShortcuts.ts"],"names":[],"mappings":"AAiFA,QAAA,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;CAId,CAAC;AAEF,eAAe,SAAS,CAAC"}
|
package/dist/ConsoleShortcuts.js
CHANGED
|
@@ -62,6 +62,18 @@ var NOTEBOOK = {
|
|
|
62
62
|
shortcut: [MODIFIER.CTRL, KEY.F],
|
|
63
63
|
macShortcut: [MODIFIER.CMD, KEY.F],
|
|
64
64
|
isEditable: false
|
|
65
|
+
}),
|
|
66
|
+
MINIMAP: ShortcutRegistry.createAndAdd({
|
|
67
|
+
id: 'NOTEBOOK.MINIMAP',
|
|
68
|
+
name: 'Show Minimap',
|
|
69
|
+
shortcut: [MODIFIER.ALT, KEY.M],
|
|
70
|
+
macShortcut: [MODIFIER.OPTION, KEY.M]
|
|
71
|
+
}),
|
|
72
|
+
WORDWRAP: ShortcutRegistry.createAndAdd({
|
|
73
|
+
id: 'NOTEBOOK.WORDWRAP',
|
|
74
|
+
name: 'Word Wrap',
|
|
75
|
+
shortcut: [MODIFIER.ALT, KEY.Z],
|
|
76
|
+
macShortcut: [MODIFIER.OPTION, KEY.Z]
|
|
65
77
|
})
|
|
66
78
|
};
|
|
67
79
|
var SHORTCUTS = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsoleShortcuts.js","names":["ShortcutRegistry","KEY","MODIFIER","CONSOLE","name","CLEAR","createAndAdd","id","shortcut","CTRL","L","macShortcut","C","FOCUS_HISTORY","H","OPTION","COMMAND_HISTORY","SEND_TO_CONSOLE","ENTER","SEND_TO_NOTEBOOK","CMD","RUN","ALT","R","NOTEBOOK","RUN_SELECTED","SHIFT","FIND","F","isEditable","SHORTCUTS"],"sources":["../src/ConsoleShortcuts.ts"],"sourcesContent":["import { ShortcutRegistry, KEY, MODIFIER } from '@deephaven/components';\n\nconst CONSOLE = {\n name: 'Console',\n CLEAR: ShortcutRegistry.createAndAdd({\n id: 'CONSOLE.CLEAR',\n name: 'Clear',\n shortcut: [MODIFIER.CTRL, KEY.L],\n macShortcut: [MODIFIER.CTRL, KEY.C],\n }),\n FOCUS_HISTORY: ShortcutRegistry.createAndAdd({\n id: 'CONSOLE.FOCUS_HISTORY',\n name: 'Focus History',\n shortcut: [MODIFIER.CTRL, KEY.H],\n macShortcut: [MODIFIER.CTRL, MODIFIER.OPTION, KEY.H], // cmd+H is a system level shortcut on Mac, so use something else\n }),\n};\n\nconst COMMAND_HISTORY = {\n name: 'Command History',\n FOCUS_HISTORY: ShortcutRegistry.createAndAdd({\n id: 'COMMAND_HISTORY.FOCUS_HISTORY',\n name: 'Focus History Search',\n shortcut: [MODIFIER.CTRL, KEY.H],\n macShortcut: [MODIFIER.CTRL, MODIFIER.OPTION, KEY.H],\n }),\n SEND_TO_CONSOLE: ShortcutRegistry.createAndAdd({\n id: 'COMMAND_HISTORY.SEND_TO_CONSOLE',\n name: 'Send to Console',\n shortcut: [KEY.ENTER],\n macShortcut: [KEY.ENTER],\n }),\n SEND_TO_NOTEBOOK: ShortcutRegistry.createAndAdd({\n id: 'COMMAND_HISTORY.SEND_TO_NOTEBOOK',\n name: 'Send to Notebook',\n shortcut: [MODIFIER.CTRL, KEY.ENTER],\n macShortcut: [MODIFIER.CMD, KEY.ENTER],\n }),\n RUN: ShortcutRegistry.createAndAdd({\n id: 'COMMAND_HISTORY.RUN',\n name: 'Run',\n shortcut: [MODIFIER.ALT, KEY.R],\n macShortcut: [MODIFIER.OPTION, KEY.R],\n }),\n};\n\nconst NOTEBOOK = {\n name: 'Notebook',\n RUN: ShortcutRegistry.createAndAdd({\n id: 'NOTEBOOK.RUN',\n name: 'Run',\n shortcut: [MODIFIER.ALT, KEY.R],\n macShortcut: [MODIFIER.OPTION, KEY.R],\n }),\n RUN_SELECTED: ShortcutRegistry.createAndAdd({\n id: 'NOTEBOOK.RUN_SELECTED',\n name: 'Run Selected',\n shortcut: [MODIFIER.ALT, MODIFIER.SHIFT, KEY.R],\n macShortcut: [MODIFIER.OPTION, MODIFIER.SHIFT, KEY.R],\n }),\n FIND: ShortcutRegistry.createAndAdd({\n id: 'NOTEBOOK.FIND',\n name: 'Find',\n shortcut: [MODIFIER.CTRL, KEY.F],\n macShortcut: [MODIFIER.CMD, KEY.F],\n isEditable: false,\n }),\n};\n\nconst SHORTCUTS = {\n CONSOLE,\n COMMAND_HISTORY,\n NOTEBOOK,\n};\n\nexport default SHORTCUTS;\n"],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ConsoleShortcuts.js","names":["ShortcutRegistry","KEY","MODIFIER","CONSOLE","name","CLEAR","createAndAdd","id","shortcut","CTRL","L","macShortcut","C","FOCUS_HISTORY","H","OPTION","COMMAND_HISTORY","SEND_TO_CONSOLE","ENTER","SEND_TO_NOTEBOOK","CMD","RUN","ALT","R","NOTEBOOK","RUN_SELECTED","SHIFT","FIND","F","isEditable","MINIMAP","M","WORDWRAP","Z","SHORTCUTS"],"sources":["../src/ConsoleShortcuts.ts"],"sourcesContent":["import { ShortcutRegistry, KEY, MODIFIER } from '@deephaven/components';\n\nconst CONSOLE = {\n name: 'Console',\n CLEAR: ShortcutRegistry.createAndAdd({\n id: 'CONSOLE.CLEAR',\n name: 'Clear',\n shortcut: [MODIFIER.CTRL, KEY.L],\n macShortcut: [MODIFIER.CTRL, KEY.C],\n }),\n FOCUS_HISTORY: ShortcutRegistry.createAndAdd({\n id: 'CONSOLE.FOCUS_HISTORY',\n name: 'Focus History',\n shortcut: [MODIFIER.CTRL, KEY.H],\n macShortcut: [MODIFIER.CTRL, MODIFIER.OPTION, KEY.H], // cmd+H is a system level shortcut on Mac, so use something else\n }),\n};\n\nconst COMMAND_HISTORY = {\n name: 'Command History',\n FOCUS_HISTORY: ShortcutRegistry.createAndAdd({\n id: 'COMMAND_HISTORY.FOCUS_HISTORY',\n name: 'Focus History Search',\n shortcut: [MODIFIER.CTRL, KEY.H],\n macShortcut: [MODIFIER.CTRL, MODIFIER.OPTION, KEY.H],\n }),\n SEND_TO_CONSOLE: ShortcutRegistry.createAndAdd({\n id: 'COMMAND_HISTORY.SEND_TO_CONSOLE',\n name: 'Send to Console',\n shortcut: [KEY.ENTER],\n macShortcut: [KEY.ENTER],\n }),\n SEND_TO_NOTEBOOK: ShortcutRegistry.createAndAdd({\n id: 'COMMAND_HISTORY.SEND_TO_NOTEBOOK',\n name: 'Send to Notebook',\n shortcut: [MODIFIER.CTRL, KEY.ENTER],\n macShortcut: [MODIFIER.CMD, KEY.ENTER],\n }),\n RUN: ShortcutRegistry.createAndAdd({\n id: 'COMMAND_HISTORY.RUN',\n name: 'Run',\n shortcut: [MODIFIER.ALT, KEY.R],\n macShortcut: [MODIFIER.OPTION, KEY.R],\n }),\n};\n\nconst NOTEBOOK = {\n name: 'Notebook',\n RUN: ShortcutRegistry.createAndAdd({\n id: 'NOTEBOOK.RUN',\n name: 'Run',\n shortcut: [MODIFIER.ALT, KEY.R],\n macShortcut: [MODIFIER.OPTION, KEY.R],\n }),\n RUN_SELECTED: ShortcutRegistry.createAndAdd({\n id: 'NOTEBOOK.RUN_SELECTED',\n name: 'Run Selected',\n shortcut: [MODIFIER.ALT, MODIFIER.SHIFT, KEY.R],\n macShortcut: [MODIFIER.OPTION, MODIFIER.SHIFT, KEY.R],\n }),\n FIND: ShortcutRegistry.createAndAdd({\n id: 'NOTEBOOK.FIND',\n name: 'Find',\n shortcut: [MODIFIER.CTRL, KEY.F],\n macShortcut: [MODIFIER.CMD, KEY.F],\n isEditable: false,\n }),\n MINIMAP: ShortcutRegistry.createAndAdd({\n id: 'NOTEBOOK.MINIMAP',\n name: 'Show Minimap',\n shortcut: [MODIFIER.ALT, KEY.M],\n macShortcut: [MODIFIER.OPTION, KEY.M],\n }),\n WORDWRAP: ShortcutRegistry.createAndAdd({\n id: 'NOTEBOOK.WORDWRAP',\n name: 'Word Wrap',\n shortcut: [MODIFIER.ALT, KEY.Z],\n macShortcut: [MODIFIER.OPTION, KEY.Z],\n }),\n};\n\nconst SHORTCUTS = {\n CONSOLE,\n COMMAND_HISTORY,\n NOTEBOOK,\n};\n\nexport default SHORTCUTS;\n"],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ interface EditorProps {
|
|
|
7
7
|
className: string;
|
|
8
8
|
onEditorInitialized: (editor: monaco.editor.IStandaloneCodeEditor) => void;
|
|
9
9
|
onEditorWillDestroy: (editor: monaco.editor.IStandaloneCodeEditor) => void;
|
|
10
|
-
settings:
|
|
10
|
+
settings: monaco.editor.IStandaloneEditorConstructionOptions;
|
|
11
11
|
}
|
|
12
12
|
declare class Editor extends Component<EditorProps, Record<string, never>> {
|
|
13
13
|
static defaultProps: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Editor.d.ts","sourceRoot":"","sources":["../../src/notebook/Editor.tsx"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAc,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAEvD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,UAAU,WAAW;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,KAAK,IAAI,CAAC;IAC3E,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,KAAK,IAAI,CAAC;IAC3E,QAAQ,EAAE,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"Editor.d.ts","sourceRoot":"","sources":["../../src/notebook/Editor.tsx"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAc,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAEvD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,UAAU,WAAW;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,KAAK,IAAI,CAAC;IAC3E,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,KAAK,IAAI,CAAC;IAC3E,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,oCAAoC,CAAC;CAC9D;AAED,cAAM,MAAO,SAAQ,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAChE,MAAM,CAAC,YAAY;;mCAEQ,IAAI;mCACJ,IAAI;;MAE7B;gBAEU,KAAK,EAAE,WAAW;IAS9B,iBAAiB,IAAI,IAAI;IAMzB,oBAAoB,IAAI,IAAI;IAM5B,SAAS,EAAE,cAAc,GAAG,IAAI,CAAC;IAEjC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC;IAE7C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAQnC,YAAY,IAAI,IAAI;IAIpB,UAAU,IAAI,IAAI;IAUlB,gBAAgB,IAAI,IAAI;IAIxB,UAAU,IAAI,IAAI;IA0ClB,aAAa,IAAI,IAAI;IAQrB,MAAM,IAAI,YAAY;CAWvB;AAED,eAAe,MAAM,CAAC"}
|
package/dist/notebook/Editor.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Editor.js","names":["React","Component","classNames","monaco","assertNotNull","MonacoUtils","Editor","constructor","props","handleResize","bind","container","state","componentDidMount","initEditor","window","addEventListener","componentWillUnmount","removeEventListener","destroyEditor","setLanguage","language","editor","model","getModel","setModelLanguage","updateDimensions","toggleFind","focus","trigger","undefined","layout","onEditorInitialized","settings","copyWithSyntaxHighlighting","fixedOverflowWidgets","folding","fontFamily","glyphMargin","lineNumbersMinChars","minimap","enabled","scrollBeyondLastLine","tabCompletion","value","wordWrap","create","addAction","id","label","keybindings","KeyMod","CtrlCmd","KeyCode","KeyF","precondition","keybindingContext","contextMenuGroupId","contextMenuOrder","run","removeConflictingKeybindings","onEditorWillDestroy","dispose","render","className"],"sources":["../../src/notebook/Editor.tsx"],"sourcesContent":["/**\n * Editor editor for large blocks of code\n */\nimport React, { Component, ReactElement } from 'react';\nimport classNames from 'classnames';\nimport * as monaco from 'monaco-editor';\nimport { assertNotNull } from '@deephaven/utils';\nimport MonacoUtils from '../monaco/MonacoUtils';\n\ninterface EditorProps {\n className: string;\n onEditorInitialized: (editor: monaco.editor.IStandaloneCodeEditor) => void;\n onEditorWillDestroy: (editor: monaco.editor.IStandaloneCodeEditor) => void;\n settings:
|
|
1
|
+
{"version":3,"file":"Editor.js","names":["React","Component","classNames","monaco","assertNotNull","MonacoUtils","Editor","constructor","props","handleResize","bind","container","state","componentDidMount","initEditor","window","addEventListener","componentWillUnmount","removeEventListener","destroyEditor","setLanguage","language","editor","model","getModel","setModelLanguage","updateDimensions","toggleFind","focus","trigger","undefined","layout","onEditorInitialized","settings","copyWithSyntaxHighlighting","fixedOverflowWidgets","folding","fontFamily","glyphMargin","lineNumbersMinChars","minimap","enabled","scrollBeyondLastLine","tabCompletion","value","wordWrap","create","addAction","id","label","keybindings","KeyMod","CtrlCmd","KeyCode","KeyF","precondition","keybindingContext","contextMenuGroupId","contextMenuOrder","run","removeConflictingKeybindings","onEditorWillDestroy","dispose","render","className"],"sources":["../../src/notebook/Editor.tsx"],"sourcesContent":["/**\n * Editor editor for large blocks of code\n */\nimport React, { Component, ReactElement } from 'react';\nimport classNames from 'classnames';\nimport * as monaco from 'monaco-editor';\nimport { assertNotNull } from '@deephaven/utils';\nimport MonacoUtils from '../monaco/MonacoUtils';\n\ninterface EditorProps {\n className: string;\n onEditorInitialized: (editor: monaco.editor.IStandaloneCodeEditor) => void;\n onEditorWillDestroy: (editor: monaco.editor.IStandaloneCodeEditor) => void;\n settings: monaco.editor.IStandaloneEditorConstructionOptions;\n}\n\nclass Editor extends Component<EditorProps, Record<string, never>> {\n static defaultProps = {\n className: 'fill-parent-absolute',\n onEditorInitialized: (): void => undefined,\n onEditorWillDestroy: (): void => undefined,\n settings: {},\n };\n\n constructor(props: EditorProps) {\n super(props);\n\n this.handleResize = this.handleResize.bind(this);\n\n this.container = null;\n this.state = {};\n }\n\n componentDidMount(): void {\n this.initEditor();\n\n window.addEventListener('resize', this.handleResize);\n }\n\n componentWillUnmount(): void {\n window.removeEventListener('resize', this.handleResize);\n\n this.destroyEditor();\n }\n\n container: HTMLDivElement | null;\n\n editor?: monaco.editor.IStandaloneCodeEditor;\n\n setLanguage(language: string): void {\n if (this.editor) {\n const model = this.editor.getModel();\n assertNotNull(model);\n monaco.editor.setModelLanguage(model, language);\n }\n }\n\n handleResize(): void {\n this.updateDimensions();\n }\n\n toggleFind(): void {\n if (this.editor) {\n // The actions.find action can no longer be triggered when the editor is not in focus, with monaco 0.22.x.\n // As a workaround, just focus the editor before triggering the action\n // https://github.com/microsoft/monaco-editor/issues/2355\n this.editor.focus();\n this.editor.trigger('toggleFind', 'actions.find', undefined);\n }\n }\n\n updateDimensions(): void {\n this.editor?.layout();\n }\n\n initEditor(): void {\n const { onEditorInitialized } = this.props;\n let { settings } = this.props;\n settings = {\n copyWithSyntaxHighlighting: false,\n fixedOverflowWidgets: true,\n folding: false,\n fontFamily: 'Fira Mono',\n glyphMargin: false,\n language: `python`,\n lineNumbersMinChars: 3,\n minimap: { enabled: false },\n scrollBeyondLastLine: false,\n tabCompletion: 'on',\n value: '',\n wordWrap: 'off',\n ...settings,\n };\n assertNotNull(this.container);\n this.editor = monaco.editor.create(this.container, settings);\n this.editor.addAction({\n id: 'find',\n label: 'Find',\n keybindings: [\n // eslint-disable-next-line no-bitwise\n monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyF,\n ],\n precondition: undefined,\n keybindingContext: undefined,\n contextMenuGroupId: 'navigation',\n contextMenuOrder: 1.0,\n\n run: () => {\n this.toggleFind();\n },\n });\n this.editor.layout();\n MonacoUtils.removeConflictingKeybindings(this.editor);\n\n onEditorInitialized(this.editor);\n }\n\n destroyEditor(): void {\n const { onEditorWillDestroy } = this.props;\n assertNotNull(this.editor);\n onEditorWillDestroy(this.editor);\n this.editor.dispose();\n this.editor = undefined;\n }\n\n render(): ReactElement {\n const { className } = this.props;\n return (\n <div\n className={classNames('editor-container', className)}\n ref={container => {\n this.container = container;\n }}\n />\n );\n }\n}\n\nexport default Editor;\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA,OAAOA,KAAP,IAAgBC,SAAhB,QAA+C,OAA/C;AACA,OAAOC,UAAP,MAAuB,YAAvB;AACA,OAAO,KAAKC,MAAZ,MAAwB,eAAxB;AACA,SAASC,aAAT,QAA8B,kBAA9B;OACOC,W;;AASP,MAAMC,MAAN,SAAqBL,SAArB,CAAmE;EAQjEM,WAAW,CAACC,KAAD,EAAqB;IAC9B,MAAMA,KAAN;;IAD8B;;IAAA;;IAG9B,KAAKC,YAAL,GAAoB,KAAKA,YAAL,CAAkBC,IAAlB,CAAuB,IAAvB,CAApB;IAEA,KAAKC,SAAL,GAAiB,IAAjB;IACA,KAAKC,KAAL,GAAa,EAAb;EACD;;EAEDC,iBAAiB,GAAS;IACxB,KAAKC,UAAL;IAEAC,MAAM,CAACC,gBAAP,CAAwB,QAAxB,EAAkC,KAAKP,YAAvC;EACD;;EAEDQ,oBAAoB,GAAS;IAC3BF,MAAM,CAACG,mBAAP,CAA2B,QAA3B,EAAqC,KAAKT,YAA1C;IAEA,KAAKU,aAAL;EACD;;EAMDC,WAAW,CAACC,QAAD,EAAyB;IAClC,IAAI,KAAKC,MAAT,EAAiB;MACf,IAAMC,KAAK,GAAG,KAAKD,MAAL,CAAYE,QAAZ,EAAd;MACApB,aAAa,CAACmB,KAAD,CAAb;MACApB,MAAM,CAACmB,MAAP,CAAcG,gBAAd,CAA+BF,KAA/B,EAAsCF,QAAtC;IACD;EACF;;EAEDZ,YAAY,GAAS;IACnB,KAAKiB,gBAAL;EACD;;EAEDC,UAAU,GAAS;IACjB,IAAI,KAAKL,MAAT,EAAiB;MACf;MACA;MACA;MACA,KAAKA,MAAL,CAAYM,KAAZ;MACA,KAAKN,MAAL,CAAYO,OAAZ,CAAoB,YAApB,EAAkC,cAAlC,EAAkDC,SAAlD;IACD;EACF;;EAEDJ,gBAAgB,GAAS;IAAA;;IACvB,qBAAKJ,MAAL,8DAAaS,MAAb;EACD;;EAEDjB,UAAU,GAAS;IACjB,IAAM;MAAEkB;IAAF,IAA0B,KAAKxB,KAArC;IACA,IAAI;MAAEyB;IAAF,IAAe,KAAKzB,KAAxB;IACAyB,QAAQ;MACNC,0BAA0B,EAAE,KADtB;MAENC,oBAAoB,EAAE,IAFhB;MAGNC,OAAO,EAAE,KAHH;MAINC,UAAU,EAAE,WAJN;MAKNC,WAAW,EAAE,KALP;MAMNjB,QAAQ,UANF;MAONkB,mBAAmB,EAAE,CAPf;MAQNC,OAAO,EAAE;QAAEC,OAAO,EAAE;MAAX,CARH;MASNC,oBAAoB,EAAE,KAThB;MAUNC,aAAa,EAAE,IAVT;MAWNC,KAAK,EAAE,EAXD;MAYNC,QAAQ,EAAE;IAZJ,GAaHZ,QAbG,CAAR;IAeA7B,aAAa,CAAC,KAAKO,SAAN,CAAb;IACA,KAAKW,MAAL,GAAcnB,MAAM,CAACmB,MAAP,CAAcwB,MAAd,CAAqB,KAAKnC,SAA1B,EAAqCsB,QAArC,CAAd;IACA,KAAKX,MAAL,CAAYyB,SAAZ,CAAsB;MACpBC,EAAE,EAAE,MADgB;MAEpBC,KAAK,EAAE,MAFa;MAGpBC,WAAW,EAAE,CACX;MACA/C,MAAM,CAACgD,MAAP,CAAcC,OAAd,GAAwBjD,MAAM,CAACkD,OAAP,CAAeC,IAF5B,CAHO;MAOpBC,YAAY,EAAEzB,SAPM;MAQpB0B,iBAAiB,EAAE1B,SARC;MASpB2B,kBAAkB,EAAE,YATA;MAUpBC,gBAAgB,EAAE,GAVE;MAYpBC,GAAG,EAAE,MAAM;QACT,KAAKhC,UAAL;MACD;IAdmB,CAAtB;IAgBA,KAAKL,MAAL,CAAYS,MAAZ;IACA1B,WAAW,CAACuD,4BAAZ,CAAyC,KAAKtC,MAA9C;IAEAU,mBAAmB,CAAC,KAAKV,MAAN,CAAnB;EACD;;EAEDH,aAAa,GAAS;IACpB,IAAM;MAAE0C;IAAF,IAA0B,KAAKrD,KAArC;IACAJ,aAAa,CAAC,KAAKkB,MAAN,CAAb;IACAuC,mBAAmB,CAAC,KAAKvC,MAAN,CAAnB;IACA,KAAKA,MAAL,CAAYwC,OAAZ;IACA,KAAKxC,MAAL,GAAcQ,SAAd;EACD;;EAEDiC,MAAM,GAAiB;IACrB,IAAM;MAAEC;IAAF,IAAgB,KAAKxD,KAA3B;IACA,oBACE;MACE,SAAS,EAAEN,UAAU,CAAC,kBAAD,EAAqB8D,SAArB,CADvB;MAEE,GAAG,EAAErD,SAAS,IAAI;QAChB,KAAKA,SAAL,GAAiBA,SAAjB;MACD;IAJH,EADF;EAQD;;AAvHgE;;gBAA7DL,M,kBACkB;EACpB0D,SAAS,EAAE,sBADS;EAEpBhC,mBAAmB,EAAE,MAAYF,SAFb;EAGpB+B,mBAAmB,EAAE,MAAY/B,SAHb;EAIpBG,QAAQ,EAAE;AAJU,C;;AAyHxB,eAAe3B,MAAf"}
|
|
@@ -15,12 +15,11 @@ interface ScriptEditorProps {
|
|
|
15
15
|
focusOnMount?: boolean;
|
|
16
16
|
onChange: (e: editor.IModelContentChangedEvent) => void;
|
|
17
17
|
onRunCommand: (command: string) => void;
|
|
18
|
+
onEditorInitialized: (editor: editor.IStandaloneCodeEditor) => void;
|
|
19
|
+
onEditorWillDestroy: (editor: editor.IStandaloneCodeEditor) => void;
|
|
18
20
|
session: IdeSession;
|
|
19
21
|
sessionLanguage?: string;
|
|
20
|
-
settings?:
|
|
21
|
-
language: string;
|
|
22
|
-
value: string | null;
|
|
23
|
-
};
|
|
22
|
+
settings?: editor.IStandaloneEditorConstructionOptions;
|
|
24
23
|
}
|
|
25
24
|
interface ScriptEditorState {
|
|
26
25
|
model: editor.ITextModel | null;
|
|
@@ -32,9 +31,9 @@ declare class ScriptEditor extends Component<ScriptEditorProps, ScriptEditorStat
|
|
|
32
31
|
isLoaded: boolean;
|
|
33
32
|
focusOnMount: boolean;
|
|
34
33
|
onChange: () => void;
|
|
34
|
+
onEditorInitialized: () => void;
|
|
35
|
+
onEditorWillDestroy: () => void;
|
|
35
36
|
session: null;
|
|
36
|
-
sessionLanguage: null;
|
|
37
|
-
settings: null;
|
|
38
37
|
};
|
|
39
38
|
constructor(props: ScriptEditorProps);
|
|
40
39
|
componentDidMount(): void;
|
|
@@ -47,7 +46,7 @@ declare class ScriptEditor extends Component<ScriptEditorProps, ScriptEditorStat
|
|
|
47
46
|
getValue(): string | null;
|
|
48
47
|
getSelectedCommand(): string;
|
|
49
48
|
handleEditorInitialized(innerEditor: editor.IStandaloneCodeEditor): void;
|
|
50
|
-
handleEditorWillDestroy(): void;
|
|
49
|
+
handleEditorWillDestroy(innerEditor: editor.IStandaloneCodeEditor): void;
|
|
51
50
|
handleRun(): void;
|
|
52
51
|
handleRunSelected(): void;
|
|
53
52
|
initContextActions(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScriptEditor.d.ts","sourceRoot":"","sources":["../../src/notebook/ScriptEditor.tsx"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAc,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGlE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,MAAM,MAAM,UAAU,CAAC;AAE9B,OAAO,qBAAqB,CAAC;AAK7B,UAAU,iBAAiB;IACzB,KAAK,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,yBAAyB,KAAK,IAAI,CAAC;IACxD,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,
|
|
1
|
+
{"version":3,"file":"ScriptEditor.d.ts","sourceRoot":"","sources":["../../src/notebook/ScriptEditor.tsx"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAc,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGlE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,MAAM,MAAM,UAAU,CAAC;AAE9B,OAAO,qBAAqB,CAAC;AAK7B,UAAU,iBAAiB;IACzB,KAAK,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,yBAAyB,KAAK,IAAI,CAAC;IACxD,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,qBAAqB,KAAK,IAAI,CAAC;IACpE,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,qBAAqB,KAAK,IAAI,CAAC;IACpE,OAAO,EAAE,UAAU,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC,oCAAoC,CAAC;CACxD;AAED,UAAU,iBAAiB;IACzB,KAAK,EAAE,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;CACjC;AAED,cAAM,YAAa,SAAQ,SAAS,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxE,MAAM,CAAC,YAAY;;;;;wBAKH,IAAI;mCACO,IAAI;mCACJ,IAAI;;MAE7B;gBAEU,KAAK,EAAE,iBAAiB;IAgBpC,iBAAiB,IAAI,IAAI;IAIzB,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAuCtD,oBAAoB,IAAI,IAAI;IAI5B,qBAAqB,EAAE,WAAW,EAAE,CAAC;IAErC,iBAAiB,CAAC,EAAE,WAAW,CAAC;IAEhC,MAAM,CAAC,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAEtC,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAEnC,QAAQ,IAAI,MAAM,GAAG,IAAI;IAQzB,kBAAkB,IAAI,MAAM;IAkB5B,uBAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,qBAAqB,GAAG,IAAI;IA+BxE,uBAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,qBAAqB,GAAG,IAAI;IAUxE,SAAS,IAAI,IAAI;IAQjB,iBAAiB,IAAI,IAAI;IAMzB,kBAAkB,IAAI,IAAI;IAgD1B,oBAAoB,IAAI,IAAI;IAO5B,eAAe,IAAI,IAAI;IAKvB,kBAAkB,IAAI,IAAI;IAY1B,oBAAoB,IAAI,IAAI;IAY5B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,UAAO,GAAG,IAAI;IAqBxC,gBAAgB,IAAI,IAAI;IAOxB,KAAK,IAAI,IAAI;IAOb,UAAU,IAAI,IAAI;IAMlB,WAAW,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAMpC,MAAM,IAAI,YAAY;CAoDvB;AAED,eAAe,YAAY,CAAC"}
|
|
@@ -7,6 +7,7 @@ import React, { Component } from 'react';
|
|
|
7
7
|
import { LoadingOverlay, ShortcutRegistry } from '@deephaven/components';
|
|
8
8
|
import Log from '@deephaven/log';
|
|
9
9
|
import { assertNotNull } from '@deephaven/utils';
|
|
10
|
+
import { editor } from 'monaco-editor';
|
|
10
11
|
import Editor from "./Editor.js";
|
|
11
12
|
import { MonacoCompletionProvider, MonacoUtils } from "../monaco/index.js";
|
|
12
13
|
import "./ScriptEditor.css";
|
|
@@ -119,6 +120,7 @@ class ScriptEditor extends Component {
|
|
|
119
120
|
var {
|
|
120
121
|
focusOnMount,
|
|
121
122
|
onChange,
|
|
123
|
+
onEditorInitialized,
|
|
122
124
|
settings,
|
|
123
125
|
session,
|
|
124
126
|
sessionLanguage
|
|
@@ -141,10 +143,16 @@ class ScriptEditor extends Component {
|
|
|
141
143
|
if (focusOnMount != null && focusOnMount) {
|
|
142
144
|
innerEditor.focus();
|
|
143
145
|
}
|
|
146
|
+
|
|
147
|
+
onEditorInitialized(this.editor);
|
|
144
148
|
}
|
|
145
149
|
|
|
146
|
-
handleEditorWillDestroy() {
|
|
150
|
+
handleEditorWillDestroy(innerEditor) {
|
|
147
151
|
log.debug('handleEditorWillDestroy');
|
|
152
|
+
var {
|
|
153
|
+
onEditorWillDestroy
|
|
154
|
+
} = this.props;
|
|
155
|
+
onEditorWillDestroy(innerEditor);
|
|
148
156
|
this.deInitContextActions();
|
|
149
157
|
this.deInitCodeCompletion();
|
|
150
158
|
this.setState({
|
|
@@ -304,6 +312,8 @@ class ScriptEditor extends Component {
|
|
|
304
312
|
}
|
|
305
313
|
|
|
306
314
|
render() {
|
|
315
|
+
var _settings$language;
|
|
316
|
+
|
|
307
317
|
var {
|
|
308
318
|
error,
|
|
309
319
|
isLoaded,
|
|
@@ -316,7 +326,7 @@ class ScriptEditor extends Component {
|
|
|
316
326
|
model
|
|
317
327
|
} = this.state;
|
|
318
328
|
var errorMessage = error ? "Unable to open document. ".concat(error) : null;
|
|
319
|
-
var editorLanguage = settings ? settings.language : null;
|
|
329
|
+
var editorLanguage = settings ? (_settings$language = settings.language) !== null && _settings$language !== void 0 ? _settings$language : null : null;
|
|
320
330
|
var completionProviderEnabled = model && session && editorLanguage === sessionLanguage;
|
|
321
331
|
return /*#__PURE__*/React.createElement(React.Fragment, null, (error || isLoading) && /*#__PURE__*/React.createElement("div", {
|
|
322
332
|
className: "h-100 w-100 position-relative"
|
|
@@ -346,9 +356,9 @@ _defineProperty(ScriptEditor, "defaultProps", {
|
|
|
346
356
|
isLoaded: false,
|
|
347
357
|
focusOnMount: true,
|
|
348
358
|
onChange: () => undefined,
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
359
|
+
onEditorInitialized: () => undefined,
|
|
360
|
+
onEditorWillDestroy: () => undefined,
|
|
361
|
+
session: null
|
|
352
362
|
});
|
|
353
363
|
|
|
354
364
|
export default ScriptEditor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScriptEditor.js","names":["React","Component","LoadingOverlay","ShortcutRegistry","Log","assertNotNull","Editor","MonacoCompletionProvider","MonacoUtils","SHORTCUTS","log","module","ScriptEditor","constructor","props","handleEditorInitialized","bind","handleEditorWillDestroy","handleRun","handleRunSelected","updateShortcuts","contextActionCleanups","editorComponent","createRef","state","model","componentDidMount","addEventListener","componentDidUpdate","prevProps","sessionLanguage","settings","language","languageChanged","debug","setLanguage","sessionDisconnected","languageMatch","prevLanguageMatch","undefined","deInitContextActions","deInitCodeCompletion","sessionConnected","initContextActions","initCodeCompletion","componentWillUnmount","removeEventListener","getValue","editor","error","getSelectedCommand","range","getSelection","getModel","startLineNumber","endColumn","endLineNumber","startLineMinColumn","getLineMinColumn","endLineMaxColumn","getLineMaxColumn","wholeLineRange","setStartPosition","setEndPosition","getValueInRange","innerEditor","focusOnMount","onChange","session","setState","setEOL","registerPasteHandler","onDidChangeModelContent","focus","onRunCommand","command","length","cleanups","push","addAction","id","label","keybindings","getMonacoKeyCodeFromShortcut","NOTEBOOK","RUN","contextMenuGroupId","contextMenuOrder","run","RUN_SELECTED","forEach","cleanup","dispose","completionCleanup","openDocument","closeDocument","append","text","currentText","setValue","lastLine","getLineCount","column","getLineLength","setPosition","lineNumber","updateDimensions","layout","toggleFind","current","render","isLoaded","isLoading","errorMessage","editorLanguage","completionProviderEnabled"],"sources":["../../src/notebook/ScriptEditor.tsx"],"sourcesContent":["/**\n * Script editor for large blocks of code\n */\nimport React, { Component, ReactElement, RefObject } from 'react';\nimport { LoadingOverlay, ShortcutRegistry } from '@deephaven/components';\nimport Log from '@deephaven/log';\nimport { IdeSession } from '@deephaven/jsapi-shim';\nimport { assertNotNull } from '@deephaven/utils';\nimport { editor, IDisposable } from 'monaco-editor';\nimport Editor from './Editor';\nimport { MonacoCompletionProvider, MonacoUtils } from '../monaco';\nimport './ScriptEditor.scss';\nimport SHORTCUTS from '../ConsoleShortcuts';\n\nconst log = Log.module('ScriptEditor');\n\ninterface ScriptEditorProps {\n error?: { message?: string };\n isLoading: boolean;\n isLoaded: boolean;\n focusOnMount?: boolean;\n onChange: (e: editor.IModelContentChangedEvent) => void;\n onRunCommand: (command: string) => void;\n session: IdeSession;\n sessionLanguage?: string;\n settings?: {\n language: string;\n value: string | null;\n };\n}\n\ninterface ScriptEditorState {\n model: editor.ITextModel | null;\n}\n\nclass ScriptEditor extends Component<ScriptEditorProps, ScriptEditorState> {\n static defaultProps = {\n error: null,\n isLoading: false,\n isLoaded: false,\n focusOnMount: true,\n onChange: (): void => undefined,\n session: null,\n sessionLanguage: null,\n settings: null,\n };\n\n constructor(props: ScriptEditorProps) {\n super(props);\n this.handleEditorInitialized = this.handleEditorInitialized.bind(this);\n this.handleEditorWillDestroy = this.handleEditorWillDestroy.bind(this);\n this.handleRun = this.handleRun.bind(this);\n this.handleRunSelected = this.handleRunSelected.bind(this);\n this.updateShortcuts = this.updateShortcuts.bind(this);\n\n this.contextActionCleanups = [];\n this.editorComponent = React.createRef();\n\n this.state = {\n model: null,\n };\n }\n\n componentDidMount(): void {\n ShortcutRegistry.addEventListener('onUpdate', this.updateShortcuts);\n }\n\n componentDidUpdate(prevProps: ScriptEditorProps): void {\n const { sessionLanguage, settings } = this.props;\n\n const language = settings?.language;\n\n const languageChanged = language !== prevProps.settings?.language;\n if (languageChanged) {\n log.debug('Set language', language);\n this.setLanguage(language);\n }\n\n const sessionDisconnected =\n sessionLanguage == null && prevProps.sessionLanguage != null;\n const languageMatch = language === sessionLanguage;\n const prevLanguageMatch =\n prevProps.settings?.language === prevProps.sessionLanguage;\n if (\n sessionDisconnected ||\n (sessionLanguage !== undefined && prevLanguageMatch && !languageMatch)\n ) {\n // Session disconnected or language changed from matching the session language to non-matching\n log.debug('De-init completion and context actions');\n this.deInitContextActions();\n this.deInitCodeCompletion();\n }\n\n const sessionConnected =\n sessionLanguage != null && prevProps.sessionLanguage == null;\n if (\n (sessionConnected && languageMatch) ||\n (sessionLanguage !== undefined && !prevLanguageMatch && languageMatch)\n ) {\n // Session connected with a matching language or notebook language changed to matching\n log.debug('Init completion and context actions');\n this.initContextActions();\n this.initCodeCompletion();\n }\n }\n\n componentWillUnmount(): void {\n ShortcutRegistry.removeEventListener('onUpdate', this.updateShortcuts);\n }\n\n contextActionCleanups: IDisposable[];\n\n completionCleanup?: IDisposable;\n\n editor?: editor.IStandaloneCodeEditor;\n\n editorComponent: RefObject<Editor>;\n\n getValue(): string | null {\n if (this.editor) {\n return this.editor.getValue();\n }\n log.error('Editor not initialized');\n return null;\n }\n\n getSelectedCommand(): string {\n const range = this.editor?.getSelection();\n assertNotNull(range);\n const model = this.editor?.getModel();\n assertNotNull(model);\n const { startLineNumber, endColumn } = range;\n let { endLineNumber } = range;\n if (endColumn === 1 && endLineNumber > startLineNumber) {\n endLineNumber -= 1;\n }\n const startLineMinColumn = model?.getLineMinColumn(startLineNumber);\n const endLineMaxColumn = model?.getLineMaxColumn(endLineNumber);\n const wholeLineRange = range\n .setStartPosition(startLineNumber, startLineMinColumn)\n .setEndPosition(endLineNumber, endLineMaxColumn);\n return model?.getValueInRange(wholeLineRange);\n }\n\n handleEditorInitialized(innerEditor: editor.IStandaloneCodeEditor): void {\n const {\n focusOnMount,\n onChange,\n settings,\n session,\n sessionLanguage,\n } = this.props;\n\n log.debug('handleEditorInitialized', sessionLanguage, session, settings);\n\n this.editor = innerEditor;\n this.setState({ model: this.editor.getModel() });\n\n MonacoUtils.setEOL(innerEditor);\n MonacoUtils.registerPasteHandler(innerEditor);\n\n if (session != null && settings && sessionLanguage === settings.language) {\n this.initContextActions();\n this.initCodeCompletion();\n }\n\n innerEditor.onDidChangeModelContent(onChange);\n if (focusOnMount != null && focusOnMount) {\n innerEditor.focus();\n }\n }\n\n handleEditorWillDestroy(): void {\n log.debug('handleEditorWillDestroy');\n this.deInitContextActions();\n this.deInitCodeCompletion();\n this.setState({ model: null });\n this.editor = undefined;\n }\n\n handleRun(): void {\n const { onRunCommand } = this.props;\n const command = this.getValue();\n if (command != null) {\n onRunCommand(command);\n }\n }\n\n handleRunSelected(): void {\n const { onRunCommand } = this.props;\n const command = this.getSelectedCommand();\n onRunCommand(command);\n }\n\n initContextActions(): void {\n if (this.contextActionCleanups.length > 0) {\n log.error('Context actions already initialized.');\n return;\n }\n\n if (!this.editor) {\n return;\n }\n\n const cleanups = [];\n cleanups.push(\n this.editor.addAction({\n id: 'run-code',\n label: 'Run',\n keybindings: [\n MonacoUtils.getMonacoKeyCodeFromShortcut(SHORTCUTS.NOTEBOOK.RUN),\n ],\n contextMenuGroupId: 'navigation',\n contextMenuOrder: 1.5,\n\n run: () => {\n this.handleRun();\n },\n })\n );\n\n cleanups.push(\n this.editor.addAction({\n id: 'run-selected-code',\n label: 'Run Selected',\n keybindings: [\n MonacoUtils.getMonacoKeyCodeFromShortcut(\n SHORTCUTS.NOTEBOOK.RUN_SELECTED\n ),\n ],\n contextMenuGroupId: 'navigation',\n contextMenuOrder: 1.5,\n\n run: () => {\n this.handleRunSelected();\n },\n })\n );\n\n this.contextActionCleanups = cleanups;\n }\n\n deInitContextActions(): void {\n if (this.contextActionCleanups.length > 0) {\n this.contextActionCleanups.forEach(cleanup => cleanup.dispose());\n this.contextActionCleanups = [];\n }\n }\n\n updateShortcuts(): void {\n this.deInitContextActions();\n this.initContextActions();\n }\n\n initCodeCompletion(): void {\n if (this.completionCleanup != null) {\n log.error('Code completion already initialized.');\n return;\n }\n const { session } = this.props;\n log.debug('initCodeCompletion', this.editor, session);\n if (this.editor && session != null) {\n this.completionCleanup = MonacoUtils.openDocument(this.editor, session);\n }\n }\n\n deInitCodeCompletion(): void {\n const { session } = this.props;\n log.debug('deInitCodeCompletion', this.editor, session);\n if (this.completionCleanup) {\n this.completionCleanup.dispose();\n this.completionCleanup = undefined;\n }\n if (this.editor && session != null) {\n MonacoUtils.closeDocument(this.editor, session);\n }\n }\n\n append(text: string, focus = true): void {\n assertNotNull(this.editor);\n const model = this.editor.getModel();\n assertNotNull(model);\n const currentText = model.getValue();\n if (currentText) {\n model.setValue(`${currentText}\\n${text}`);\n } else {\n model.setValue(`${text}`);\n }\n\n const lastLine = model.getLineCount();\n const column = model.getLineLength(lastLine) + 1;\n\n this.editor.setPosition({ lineNumber: lastLine, column });\n\n if (focus) {\n this.editor.focus();\n }\n }\n\n updateDimensions(): void {\n log.debug('updateDimensions');\n if (this.editor) {\n this.editor.layout();\n }\n }\n\n focus(): void {\n log.debug('focus');\n if (this.editor) {\n this.editor.focus();\n }\n }\n\n toggleFind(): void {\n if (this.editorComponent.current) {\n this.editorComponent.current.toggleFind();\n }\n }\n\n setLanguage(language?: string): void {\n if (this.editorComponent.current && language !== undefined) {\n this.editorComponent.current.setLanguage(language);\n }\n }\n\n render(): ReactElement {\n const {\n error,\n isLoaded,\n isLoading,\n session,\n sessionLanguage,\n settings,\n } = this.props;\n const { model } = this.state;\n const errorMessage = error ? `Unable to open document. ${error}` : null;\n const editorLanguage = settings ? settings.language : null;\n const completionProviderEnabled =\n model && session && editorLanguage === sessionLanguage;\n\n return (\n <>\n {(error || isLoading) && (\n <div className=\"h-100 w-100 position-relative\">\n <LoadingOverlay\n errorMessage={errorMessage}\n isLoading={isLoading}\n isLoaded={isLoaded}\n />\n </div>\n )}\n\n {isLoaded && (\n <div className=\"h-100 w-100 script-editor\">\n {settings && (\n <>\n <Editor\n ref={this.editorComponent}\n settings={settings}\n onEditorInitialized={this.handleEditorInitialized}\n onEditorWillDestroy={this.handleEditorWillDestroy}\n />\n {completionProviderEnabled != null &&\n completionProviderEnabled && (\n <MonacoCompletionProvider\n model={model}\n language={editorLanguage}\n session={session}\n />\n )}\n </>\n )}\n </div>\n )}\n </>\n );\n }\n}\n\nexport default ScriptEditor;\n"],"mappings":";;AAAA;AACA;AACA;AACA,OAAOA,KAAP,IAAgBC,SAAhB,QAA0D,OAA1D;AACA,SAASC,cAAT,EAAyBC,gBAAzB,QAAiD,uBAAjD;AACA,OAAOC,GAAP,MAAgB,gBAAhB;AAEA,SAASC,aAAT,QAA8B,kBAA9B;OAEOC,M;SACEC,wB,EAA0BC,W;;OAE5BC,S;AAEP,IAAMC,GAAG,GAAGN,GAAG,CAACO,MAAJ,CAAW,cAAX,CAAZ;;AAqBA,MAAMC,YAAN,SAA2BX,SAA3B,CAA2E;EAYzEY,WAAW,CAACC,KAAD,EAA2B;IACpC,MAAMA,KAAN;;IADoC;;IAAA;;IAAA;;IAAA;;IAEpC,KAAKC,uBAAL,GAA+B,KAAKA,uBAAL,CAA6BC,IAA7B,CAAkC,IAAlC,CAA/B;IACA,KAAKC,uBAAL,GAA+B,KAAKA,uBAAL,CAA6BD,IAA7B,CAAkC,IAAlC,CAA/B;IACA,KAAKE,SAAL,GAAiB,KAAKA,SAAL,CAAeF,IAAf,CAAoB,IAApB,CAAjB;IACA,KAAKG,iBAAL,GAAyB,KAAKA,iBAAL,CAAuBH,IAAvB,CAA4B,IAA5B,CAAzB;IACA,KAAKI,eAAL,GAAuB,KAAKA,eAAL,CAAqBJ,IAArB,CAA0B,IAA1B,CAAvB;IAEA,KAAKK,qBAAL,GAA6B,EAA7B;IACA,KAAKC,eAAL,gBAAuBtB,KAAK,CAACuB,SAAN,EAAvB;IAEA,KAAKC,KAAL,GAAa;MACXC,KAAK,EAAE;IADI,CAAb;EAGD;;EAEDC,iBAAiB,GAAS;IACxBvB,gBAAgB,CAACwB,gBAAjB,CAAkC,UAAlC,EAA8C,KAAKP,eAAnD;EACD;;EAEDQ,kBAAkB,CAACC,SAAD,EAAqC;IAAA;;IACrD,IAAM;MAAEC,eAAF;MAAmBC;IAAnB,IAAgC,KAAKjB,KAA3C;IAEA,IAAMkB,QAAQ,GAAGD,QAAH,aAAGA,QAAH,uBAAGA,QAAQ,CAAEC,QAA3B;IAEA,IAAMC,eAAe,GAAGD,QAAQ,6BAAKH,SAAS,CAACE,QAAf,wDAAK,oBAAoBC,QAAzB,CAAhC;;IACA,IAAIC,eAAJ,EAAqB;MACnBvB,GAAG,CAACwB,KAAJ,CAAU,cAAV,EAA0BF,QAA1B;MACA,KAAKG,WAAL,CAAiBH,QAAjB;IACD;;IAED,IAAMI,mBAAmB,GACvBN,eAAe,IAAI,IAAnB,IAA2BD,SAAS,CAACC,eAAV,IAA6B,IAD1D;IAEA,IAAMO,aAAa,GAAGL,QAAQ,KAAKF,eAAnC;IACA,IAAMQ,iBAAiB,GACrB,yBAAAT,SAAS,CAACE,QAAV,8EAAoBC,QAApB,MAAiCH,SAAS,CAACC,eAD7C;;IAEA,IACEM,mBAAmB,IAClBN,eAAe,KAAKS,SAApB,IAAiCD,iBAAjC,IAAsD,CAACD,aAF1D,EAGE;MACA;MACA3B,GAAG,CAACwB,KAAJ,CAAU,wCAAV;MACA,KAAKM,oBAAL;MACA,KAAKC,oBAAL;IACD;;IAED,IAAMC,gBAAgB,GACpBZ,eAAe,IAAI,IAAnB,IAA2BD,SAAS,CAACC,eAAV,IAA6B,IAD1D;;IAEA,IACGY,gBAAgB,IAAIL,aAArB,IACCP,eAAe,KAAKS,SAApB,IAAiC,CAACD,iBAAlC,IAAuDD,aAF1D,EAGE;MACA;MACA3B,GAAG,CAACwB,KAAJ,CAAU,qCAAV;MACA,KAAKS,kBAAL;MACA,KAAKC,kBAAL;IACD;EACF;;EAEDC,oBAAoB,GAAS;IAC3B1C,gBAAgB,CAAC2C,mBAAjB,CAAqC,UAArC,EAAiD,KAAK1B,eAAtD;EACD;;EAUD2B,QAAQ,GAAkB;IACxB,IAAI,KAAKC,MAAT,EAAiB;MACf,OAAO,KAAKA,MAAL,CAAYD,QAAZ,EAAP;IACD;;IACDrC,GAAG,CAACuC,KAAJ,CAAU,wBAAV;IACA,OAAO,IAAP;EACD;;EAEDC,kBAAkB,GAAW;IAAA;;IAC3B,IAAMC,KAAK,mBAAG,KAAKH,MAAR,iDAAG,aAAaI,YAAb,EAAd;IACA/C,aAAa,CAAC8C,KAAD,CAAb;IACA,IAAM1B,KAAK,oBAAG,KAAKuB,MAAR,kDAAG,cAAaK,QAAb,EAAd;IACAhD,aAAa,CAACoB,KAAD,CAAb;IACA,IAAM;MAAE6B,eAAF;MAAmBC;IAAnB,IAAiCJ,KAAvC;IACA,IAAI;MAAEK;IAAF,IAAoBL,KAAxB;;IACA,IAAII,SAAS,KAAK,CAAd,IAAmBC,aAAa,GAAGF,eAAvC,EAAwD;MACtDE,aAAa,IAAI,CAAjB;IACD;;IACD,IAAMC,kBAAkB,GAAGhC,KAAH,aAAGA,KAAH,uBAAGA,KAAK,CAAEiC,gBAAP,CAAwBJ,eAAxB,CAA3B;IACA,IAAMK,gBAAgB,GAAGlC,KAAH,aAAGA,KAAH,uBAAGA,KAAK,CAAEmC,gBAAP,CAAwBJ,aAAxB,CAAzB;IACA,IAAMK,cAAc,GAAGV,KAAK,CACzBW,gBADoB,CACHR,eADG,EACcG,kBADd,EAEpBM,cAFoB,CAELP,aAFK,EAEUG,gBAFV,CAAvB;IAGA,OAAOlC,KAAP,aAAOA,KAAP,uBAAOA,KAAK,CAAEuC,eAAP,CAAuBH,cAAvB,CAAP;EACD;;EAED9C,uBAAuB,CAACkD,WAAD,EAAkD;IACvE,IAAM;MACJC,YADI;MAEJC,QAFI;MAGJpC,QAHI;MAIJqC,OAJI;MAKJtC;IALI,IAMF,KAAKhB,KANT;IAQAJ,GAAG,CAACwB,KAAJ,CAAU,yBAAV,EAAqCJ,eAArC,EAAsDsC,OAAtD,EAA+DrC,QAA/D;IAEA,KAAKiB,MAAL,GAAciB,WAAd;IACA,KAAKI,QAAL,CAAc;MAAE5C,KAAK,EAAE,KAAKuB,MAAL,CAAYK,QAAZ;IAAT,CAAd;IAEA7C,WAAW,CAAC8D,MAAZ,CAAmBL,WAAnB;IACAzD,WAAW,CAAC+D,oBAAZ,CAAiCN,WAAjC;;IAEA,IAAIG,OAAO,IAAI,IAAX,IAAmBrC,QAAnB,IAA+BD,eAAe,KAAKC,QAAQ,CAACC,QAAhE,EAA0E;MACxE,KAAKW,kBAAL;MACA,KAAKC,kBAAL;IACD;;IAEDqB,WAAW,CAACO,uBAAZ,CAAoCL,QAApC;;IACA,IAAID,YAAY,IAAI,IAAhB,IAAwBA,YAA5B,EAA0C;MACxCD,WAAW,CAACQ,KAAZ;IACD;EACF;;EAEDxD,uBAAuB,GAAS;IAC9BP,GAAG,CAACwB,KAAJ,CAAU,yBAAV;IACA,KAAKM,oBAAL;IACA,KAAKC,oBAAL;IACA,KAAK4B,QAAL,CAAc;MAAE5C,KAAK,EAAE;IAAT,CAAd;IACA,KAAKuB,MAAL,GAAcT,SAAd;EACD;;EAEDrB,SAAS,GAAS;IAChB,IAAM;MAAEwD;IAAF,IAAmB,KAAK5D,KAA9B;IACA,IAAM6D,OAAO,GAAG,KAAK5B,QAAL,EAAhB;;IACA,IAAI4B,OAAO,IAAI,IAAf,EAAqB;MACnBD,YAAY,CAACC,OAAD,CAAZ;IACD;EACF;;EAEDxD,iBAAiB,GAAS;IACxB,IAAM;MAAEuD;IAAF,IAAmB,KAAK5D,KAA9B;IACA,IAAM6D,OAAO,GAAG,KAAKzB,kBAAL,EAAhB;IACAwB,YAAY,CAACC,OAAD,CAAZ;EACD;;EAEDhC,kBAAkB,GAAS;IACzB,IAAI,KAAKtB,qBAAL,CAA2BuD,MAA3B,GAAoC,CAAxC,EAA2C;MACzClE,GAAG,CAACuC,KAAJ,CAAU,sCAAV;MACA;IACD;;IAED,IAAI,CAAC,KAAKD,MAAV,EAAkB;MAChB;IACD;;IAED,IAAM6B,QAAQ,GAAG,EAAjB;IACAA,QAAQ,CAACC,IAAT,CACE,KAAK9B,MAAL,CAAY+B,SAAZ,CAAsB;MACpBC,EAAE,EAAE,UADgB;MAEpBC,KAAK,EAAE,KAFa;MAGpBC,WAAW,EAAE,CACX1E,WAAW,CAAC2E,4BAAZ,CAAyC1E,SAAS,CAAC2E,QAAV,CAAmBC,GAA5D,CADW,CAHO;MAMpBC,kBAAkB,EAAE,YANA;MAOpBC,gBAAgB,EAAE,GAPE;MASpBC,GAAG,EAAE,MAAM;QACT,KAAKtE,SAAL;MACD;IAXmB,CAAtB,CADF;IAgBA2D,QAAQ,CAACC,IAAT,CACE,KAAK9B,MAAL,CAAY+B,SAAZ,CAAsB;MACpBC,EAAE,EAAE,mBADgB;MAEpBC,KAAK,EAAE,cAFa;MAGpBC,WAAW,EAAE,CACX1E,WAAW,CAAC2E,4BAAZ,CACE1E,SAAS,CAAC2E,QAAV,CAAmBK,YADrB,CADW,CAHO;MAQpBH,kBAAkB,EAAE,YARA;MASpBC,gBAAgB,EAAE,GATE;MAWpBC,GAAG,EAAE,MAAM;QACT,KAAKrE,iBAAL;MACD;IAbmB,CAAtB,CADF;IAkBA,KAAKE,qBAAL,GAA6BwD,QAA7B;EACD;;EAEDrC,oBAAoB,GAAS;IAC3B,IAAI,KAAKnB,qBAAL,CAA2BuD,MAA3B,GAAoC,CAAxC,EAA2C;MACzC,KAAKvD,qBAAL,CAA2BqE,OAA3B,CAAmCC,OAAO,IAAIA,OAAO,CAACC,OAAR,EAA9C;MACA,KAAKvE,qBAAL,GAA6B,EAA7B;IACD;EACF;;EAEDD,eAAe,GAAS;IACtB,KAAKoB,oBAAL;IACA,KAAKG,kBAAL;EACD;;EAEDC,kBAAkB,GAAS;IACzB,IAAI,KAAKiD,iBAAL,IAA0B,IAA9B,EAAoC;MAClCnF,GAAG,CAACuC,KAAJ,CAAU,sCAAV;MACA;IACD;;IACD,IAAM;MAAEmB;IAAF,IAAc,KAAKtD,KAAzB;IACAJ,GAAG,CAACwB,KAAJ,CAAU,oBAAV,EAAgC,KAAKc,MAArC,EAA6CoB,OAA7C;;IACA,IAAI,KAAKpB,MAAL,IAAeoB,OAAO,IAAI,IAA9B,EAAoC;MAClC,KAAKyB,iBAAL,GAAyBrF,WAAW,CAACsF,YAAZ,CAAyB,KAAK9C,MAA9B,EAAsCoB,OAAtC,CAAzB;IACD;EACF;;EAED3B,oBAAoB,GAAS;IAC3B,IAAM;MAAE2B;IAAF,IAAc,KAAKtD,KAAzB;IACAJ,GAAG,CAACwB,KAAJ,CAAU,sBAAV,EAAkC,KAAKc,MAAvC,EAA+CoB,OAA/C;;IACA,IAAI,KAAKyB,iBAAT,EAA4B;MAC1B,KAAKA,iBAAL,CAAuBD,OAAvB;MACA,KAAKC,iBAAL,GAAyBtD,SAAzB;IACD;;IACD,IAAI,KAAKS,MAAL,IAAeoB,OAAO,IAAI,IAA9B,EAAoC;MAClC5D,WAAW,CAACuF,aAAZ,CAA0B,KAAK/C,MAA/B,EAAuCoB,OAAvC;IACD;EACF;;EAED4B,MAAM,CAACC,IAAD,EAAmC;IAAA,IAApBxB,KAAoB,uEAAZ,IAAY;IACvCpE,aAAa,CAAC,KAAK2C,MAAN,CAAb;IACA,IAAMvB,KAAK,GAAG,KAAKuB,MAAL,CAAYK,QAAZ,EAAd;IACAhD,aAAa,CAACoB,KAAD,CAAb;IACA,IAAMyE,WAAW,GAAGzE,KAAK,CAACsB,QAAN,EAApB;;IACA,IAAImD,WAAJ,EAAiB;MACfzE,KAAK,CAAC0E,QAAN,WAAkBD,WAAlB,eAAkCD,IAAlC;IACD,CAFD,MAEO;MACLxE,KAAK,CAAC0E,QAAN,WAAkBF,IAAlB;IACD;;IAED,IAAMG,QAAQ,GAAG3E,KAAK,CAAC4E,YAAN,EAAjB;IACA,IAAMC,MAAM,GAAG7E,KAAK,CAAC8E,aAAN,CAAoBH,QAApB,IAAgC,CAA/C;IAEA,KAAKpD,MAAL,CAAYwD,WAAZ,CAAwB;MAAEC,UAAU,EAAEL,QAAd;MAAwBE;IAAxB,CAAxB;;IAEA,IAAI7B,KAAJ,EAAW;MACT,KAAKzB,MAAL,CAAYyB,KAAZ;IACD;EACF;;EAEDiC,gBAAgB,GAAS;IACvBhG,GAAG,CAACwB,KAAJ,CAAU,kBAAV;;IACA,IAAI,KAAKc,MAAT,EAAiB;MACf,KAAKA,MAAL,CAAY2D,MAAZ;IACD;EACF;;EAEDlC,KAAK,GAAS;IACZ/D,GAAG,CAACwB,KAAJ,CAAU,OAAV;;IACA,IAAI,KAAKc,MAAT,EAAiB;MACf,KAAKA,MAAL,CAAYyB,KAAZ;IACD;EACF;;EAEDmC,UAAU,GAAS;IACjB,IAAI,KAAKtF,eAAL,CAAqBuF,OAAzB,EAAkC;MAChC,KAAKvF,eAAL,CAAqBuF,OAArB,CAA6BD,UAA7B;IACD;EACF;;EAEDzE,WAAW,CAACH,QAAD,EAA0B;IACnC,IAAI,KAAKV,eAAL,CAAqBuF,OAArB,IAAgC7E,QAAQ,KAAKO,SAAjD,EAA4D;MAC1D,KAAKjB,eAAL,CAAqBuF,OAArB,CAA6B1E,WAA7B,CAAyCH,QAAzC;IACD;EACF;;EAED8E,MAAM,GAAiB;IACrB,IAAM;MACJ7D,KADI;MAEJ8D,QAFI;MAGJC,SAHI;MAIJ5C,OAJI;MAKJtC,eALI;MAMJC;IANI,IAOF,KAAKjB,KAPT;IAQA,IAAM;MAAEW;IAAF,IAAY,KAAKD,KAAvB;IACA,IAAMyF,YAAY,GAAGhE,KAAK,sCAA+BA,KAA/B,IAAyC,IAAnE;IACA,IAAMiE,cAAc,GAAGnF,QAAQ,GAAGA,QAAQ,CAACC,QAAZ,GAAuB,IAAtD;IACA,IAAMmF,yBAAyB,GAC7B1F,KAAK,IAAI2C,OAAT,IAAoB8C,cAAc,KAAKpF,eADzC;IAGA,oBACE,0CACG,CAACmB,KAAK,IAAI+D,SAAV,kBACC;MAAK,SAAS,EAAC;IAAf,gBACE,oBAAC,cAAD;MACE,YAAY,EAAEC,YADhB;MAEE,SAAS,EAAED,SAFb;MAGE,QAAQ,EAAED;IAHZ,EADF,CAFJ,EAWGA,QAAQ,iBACP;MAAK,SAAS,EAAC;IAAf,GACGhF,QAAQ,iBACP,uDACE,oBAAC,MAAD;MACE,GAAG,EAAE,KAAKT,eADZ;MAEE,QAAQ,EAAES,QAFZ;MAGE,mBAAmB,EAAE,KAAKhB,uBAH5B;MAIE,mBAAmB,EAAE,KAAKE;IAJ5B,EADF,EAOGkG,yBAAyB,IAAI,IAA7B,IACCA,yBADD,iBAEG,oBAAC,wBAAD;MACE,KAAK,EAAE1F,KADT;MAEE,QAAQ,EAAEyF,cAFZ;MAGE,OAAO,EAAE9C;IAHX,EATN,CAFJ,CAZJ,CADF;EAoCD;;AArVwE;;gBAArExD,Y,kBACkB;EACpBqC,KAAK,EAAE,IADa;EAEpB+D,SAAS,EAAE,KAFS;EAGpBD,QAAQ,EAAE,KAHU;EAIpB7C,YAAY,EAAE,IAJM;EAKpBC,QAAQ,EAAE,MAAY5B,SALF;EAMpB6B,OAAO,EAAE,IANW;EAOpBtC,eAAe,EAAE,IAPG;EAQpBC,QAAQ,EAAE;AARU,C;;AAuVxB,eAAenB,YAAf"}
|
|
1
|
+
{"version":3,"file":"ScriptEditor.js","names":["React","Component","LoadingOverlay","ShortcutRegistry","Log","assertNotNull","editor","Editor","MonacoCompletionProvider","MonacoUtils","SHORTCUTS","log","module","ScriptEditor","constructor","props","handleEditorInitialized","bind","handleEditorWillDestroy","handleRun","handleRunSelected","updateShortcuts","contextActionCleanups","editorComponent","createRef","state","model","componentDidMount","addEventListener","componentDidUpdate","prevProps","sessionLanguage","settings","language","languageChanged","debug","setLanguage","sessionDisconnected","languageMatch","prevLanguageMatch","undefined","deInitContextActions","deInitCodeCompletion","sessionConnected","initContextActions","initCodeCompletion","componentWillUnmount","removeEventListener","getValue","error","getSelectedCommand","range","getSelection","getModel","startLineNumber","endColumn","endLineNumber","startLineMinColumn","getLineMinColumn","endLineMaxColumn","getLineMaxColumn","wholeLineRange","setStartPosition","setEndPosition","getValueInRange","innerEditor","focusOnMount","onChange","onEditorInitialized","session","setState","setEOL","registerPasteHandler","onDidChangeModelContent","focus","onEditorWillDestroy","onRunCommand","command","length","cleanups","push","addAction","id","label","keybindings","getMonacoKeyCodeFromShortcut","NOTEBOOK","RUN","contextMenuGroupId","contextMenuOrder","run","RUN_SELECTED","forEach","cleanup","dispose","completionCleanup","openDocument","closeDocument","append","text","currentText","setValue","lastLine","getLineCount","column","getLineLength","setPosition","lineNumber","updateDimensions","layout","toggleFind","current","render","isLoaded","isLoading","errorMessage","editorLanguage","completionProviderEnabled"],"sources":["../../src/notebook/ScriptEditor.tsx"],"sourcesContent":["/**\n * Script editor for large blocks of code\n */\nimport React, { Component, ReactElement, RefObject } from 'react';\nimport { LoadingOverlay, ShortcutRegistry } from '@deephaven/components';\nimport Log from '@deephaven/log';\nimport { IdeSession } from '@deephaven/jsapi-shim';\nimport { assertNotNull } from '@deephaven/utils';\nimport { editor, IDisposable } from 'monaco-editor';\nimport Editor from './Editor';\nimport { MonacoCompletionProvider, MonacoUtils } from '../monaco';\nimport './ScriptEditor.scss';\nimport SHORTCUTS from '../ConsoleShortcuts';\n\nconst log = Log.module('ScriptEditor');\n\ninterface ScriptEditorProps {\n error?: { message?: string };\n isLoading: boolean;\n isLoaded: boolean;\n focusOnMount?: boolean;\n onChange: (e: editor.IModelContentChangedEvent) => void;\n onRunCommand: (command: string) => void;\n onEditorInitialized: (editor: editor.IStandaloneCodeEditor) => void;\n onEditorWillDestroy: (editor: editor.IStandaloneCodeEditor) => void;\n session: IdeSession;\n sessionLanguage?: string;\n settings?: editor.IStandaloneEditorConstructionOptions;\n}\n\ninterface ScriptEditorState {\n model: editor.ITextModel | null;\n}\n\nclass ScriptEditor extends Component<ScriptEditorProps, ScriptEditorState> {\n static defaultProps = {\n error: null,\n isLoading: false,\n isLoaded: false,\n focusOnMount: true,\n onChange: (): void => undefined,\n onEditorInitialized: (): void => undefined,\n onEditorWillDestroy: (): void => undefined,\n session: null,\n };\n\n constructor(props: ScriptEditorProps) {\n super(props);\n this.handleEditorInitialized = this.handleEditorInitialized.bind(this);\n this.handleEditorWillDestroy = this.handleEditorWillDestroy.bind(this);\n this.handleRun = this.handleRun.bind(this);\n this.handleRunSelected = this.handleRunSelected.bind(this);\n this.updateShortcuts = this.updateShortcuts.bind(this);\n\n this.contextActionCleanups = [];\n this.editorComponent = React.createRef();\n\n this.state = {\n model: null,\n };\n }\n\n componentDidMount(): void {\n ShortcutRegistry.addEventListener('onUpdate', this.updateShortcuts);\n }\n\n componentDidUpdate(prevProps: ScriptEditorProps): void {\n const { sessionLanguage, settings } = this.props;\n\n const language = settings?.language;\n\n const languageChanged = language !== prevProps.settings?.language;\n if (languageChanged) {\n log.debug('Set language', language);\n this.setLanguage(language);\n }\n\n const sessionDisconnected =\n sessionLanguage == null && prevProps.sessionLanguage != null;\n const languageMatch = language === sessionLanguage;\n const prevLanguageMatch =\n prevProps.settings?.language === prevProps.sessionLanguage;\n if (\n sessionDisconnected ||\n (sessionLanguage !== undefined && prevLanguageMatch && !languageMatch)\n ) {\n // Session disconnected or language changed from matching the session language to non-matching\n log.debug('De-init completion and context actions');\n this.deInitContextActions();\n this.deInitCodeCompletion();\n }\n\n const sessionConnected =\n sessionLanguage != null && prevProps.sessionLanguage == null;\n if (\n (sessionConnected && languageMatch) ||\n (sessionLanguage !== undefined && !prevLanguageMatch && languageMatch)\n ) {\n // Session connected with a matching language or notebook language changed to matching\n log.debug('Init completion and context actions');\n this.initContextActions();\n this.initCodeCompletion();\n }\n }\n\n componentWillUnmount(): void {\n ShortcutRegistry.removeEventListener('onUpdate', this.updateShortcuts);\n }\n\n contextActionCleanups: IDisposable[];\n\n completionCleanup?: IDisposable;\n\n editor?: editor.IStandaloneCodeEditor;\n\n editorComponent: RefObject<Editor>;\n\n getValue(): string | null {\n if (this.editor) {\n return this.editor.getValue();\n }\n log.error('Editor not initialized');\n return null;\n }\n\n getSelectedCommand(): string {\n const range = this.editor?.getSelection();\n assertNotNull(range);\n const model = this.editor?.getModel();\n assertNotNull(model);\n const { startLineNumber, endColumn } = range;\n let { endLineNumber } = range;\n if (endColumn === 1 && endLineNumber > startLineNumber) {\n endLineNumber -= 1;\n }\n const startLineMinColumn = model?.getLineMinColumn(startLineNumber);\n const endLineMaxColumn = model?.getLineMaxColumn(endLineNumber);\n const wholeLineRange = range\n .setStartPosition(startLineNumber, startLineMinColumn)\n .setEndPosition(endLineNumber, endLineMaxColumn);\n return model?.getValueInRange(wholeLineRange);\n }\n\n handleEditorInitialized(innerEditor: editor.IStandaloneCodeEditor): void {\n const {\n focusOnMount,\n onChange,\n onEditorInitialized,\n settings,\n session,\n sessionLanguage,\n } = this.props;\n\n log.debug('handleEditorInitialized', sessionLanguage, session, settings);\n\n this.editor = innerEditor;\n this.setState({ model: this.editor.getModel() });\n\n MonacoUtils.setEOL(innerEditor);\n MonacoUtils.registerPasteHandler(innerEditor);\n\n if (session != null && settings && sessionLanguage === settings.language) {\n this.initContextActions();\n this.initCodeCompletion();\n }\n\n innerEditor.onDidChangeModelContent(onChange);\n if (focusOnMount != null && focusOnMount) {\n innerEditor.focus();\n }\n\n onEditorInitialized(this.editor);\n }\n\n handleEditorWillDestroy(innerEditor: editor.IStandaloneCodeEditor): void {\n log.debug('handleEditorWillDestroy');\n const { onEditorWillDestroy } = this.props;\n onEditorWillDestroy(innerEditor);\n this.deInitContextActions();\n this.deInitCodeCompletion();\n this.setState({ model: null });\n this.editor = undefined;\n }\n\n handleRun(): void {\n const { onRunCommand } = this.props;\n const command = this.getValue();\n if (command != null) {\n onRunCommand(command);\n }\n }\n\n handleRunSelected(): void {\n const { onRunCommand } = this.props;\n const command = this.getSelectedCommand();\n onRunCommand(command);\n }\n\n initContextActions(): void {\n if (this.contextActionCleanups.length > 0) {\n log.error('Context actions already initialized.');\n return;\n }\n\n if (!this.editor) {\n return;\n }\n\n const cleanups = [];\n cleanups.push(\n this.editor.addAction({\n id: 'run-code',\n label: 'Run',\n keybindings: [\n MonacoUtils.getMonacoKeyCodeFromShortcut(SHORTCUTS.NOTEBOOK.RUN),\n ],\n contextMenuGroupId: 'navigation',\n contextMenuOrder: 1.5,\n\n run: () => {\n this.handleRun();\n },\n })\n );\n\n cleanups.push(\n this.editor.addAction({\n id: 'run-selected-code',\n label: 'Run Selected',\n keybindings: [\n MonacoUtils.getMonacoKeyCodeFromShortcut(\n SHORTCUTS.NOTEBOOK.RUN_SELECTED\n ),\n ],\n contextMenuGroupId: 'navigation',\n contextMenuOrder: 1.5,\n\n run: () => {\n this.handleRunSelected();\n },\n })\n );\n\n this.contextActionCleanups = cleanups;\n }\n\n deInitContextActions(): void {\n if (this.contextActionCleanups.length > 0) {\n this.contextActionCleanups.forEach(cleanup => cleanup.dispose());\n this.contextActionCleanups = [];\n }\n }\n\n updateShortcuts(): void {\n this.deInitContextActions();\n this.initContextActions();\n }\n\n initCodeCompletion(): void {\n if (this.completionCleanup != null) {\n log.error('Code completion already initialized.');\n return;\n }\n const { session } = this.props;\n log.debug('initCodeCompletion', this.editor, session);\n if (this.editor && session != null) {\n this.completionCleanup = MonacoUtils.openDocument(this.editor, session);\n }\n }\n\n deInitCodeCompletion(): void {\n const { session } = this.props;\n log.debug('deInitCodeCompletion', this.editor, session);\n if (this.completionCleanup) {\n this.completionCleanup.dispose();\n this.completionCleanup = undefined;\n }\n if (this.editor && session != null) {\n MonacoUtils.closeDocument(this.editor, session);\n }\n }\n\n append(text: string, focus = true): void {\n assertNotNull(this.editor);\n const model = this.editor.getModel();\n assertNotNull(model);\n const currentText = model.getValue();\n if (currentText) {\n model.setValue(`${currentText}\\n${text}`);\n } else {\n model.setValue(`${text}`);\n }\n\n const lastLine = model.getLineCount();\n const column = model.getLineLength(lastLine) + 1;\n\n this.editor.setPosition({ lineNumber: lastLine, column });\n\n if (focus) {\n this.editor.focus();\n }\n }\n\n updateDimensions(): void {\n log.debug('updateDimensions');\n if (this.editor) {\n this.editor.layout();\n }\n }\n\n focus(): void {\n log.debug('focus');\n if (this.editor) {\n this.editor.focus();\n }\n }\n\n toggleFind(): void {\n if (this.editorComponent.current) {\n this.editorComponent.current.toggleFind();\n }\n }\n\n setLanguage(language?: string): void {\n if (this.editorComponent.current && language !== undefined) {\n this.editorComponent.current.setLanguage(language);\n }\n }\n\n render(): ReactElement {\n const {\n error,\n isLoaded,\n isLoading,\n session,\n sessionLanguage,\n settings,\n } = this.props;\n const { model } = this.state;\n const errorMessage = error ? `Unable to open document. ${error}` : null;\n const editorLanguage = settings ? settings.language ?? null : null;\n const completionProviderEnabled =\n model && session && editorLanguage === sessionLanguage;\n\n return (\n <>\n {(error || isLoading) && (\n <div className=\"h-100 w-100 position-relative\">\n <LoadingOverlay\n errorMessage={errorMessage}\n isLoading={isLoading}\n isLoaded={isLoaded}\n />\n </div>\n )}\n\n {isLoaded && (\n <div className=\"h-100 w-100 script-editor\">\n {settings && (\n <>\n <Editor\n ref={this.editorComponent}\n settings={settings}\n onEditorInitialized={this.handleEditorInitialized}\n onEditorWillDestroy={this.handleEditorWillDestroy}\n />\n {completionProviderEnabled != null &&\n completionProviderEnabled && (\n <MonacoCompletionProvider\n model={model}\n language={editorLanguage}\n session={session}\n />\n )}\n </>\n )}\n </div>\n )}\n </>\n );\n }\n}\n\nexport default ScriptEditor;\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@deephaven/console",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.22.0",
|
|
4
4
|
"description": "Deephaven Console",
|
|
5
5
|
"author": "Deephaven Data Labs LLC",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -19,25 +19,17 @@
|
|
|
19
19
|
},
|
|
20
20
|
"scripts": {
|
|
21
21
|
"build": "cross-env NODE_ENV=production run-p build:*",
|
|
22
|
-
"build
|
|
23
|
-
"
|
|
24
|
-
"sass": "sass --embed-sources --load-path=../../node_modules ./src:./dist",
|
|
25
|
-
"build:babel": "npm run babel",
|
|
26
|
-
"build:sass": "npm run sass",
|
|
27
|
-
"watch": "run-p watch:*",
|
|
28
|
-
"watch:babel": "npm run babel -- -w --skip-initial-build",
|
|
29
|
-
"watch:sass": "npm run sass -- --watch --update",
|
|
30
|
-
"prestart": "npm run build-dev",
|
|
31
|
-
"start": "cross-env NODE_ENV=development npm run watch"
|
|
22
|
+
"build:babel": "babel ./src --out-dir ./dist --extensions \".ts,.tsx,.js,.jsx\" --source-maps --root-mode upward",
|
|
23
|
+
"build:sass": "sass --embed-sources --load-path=../../node_modules ./src:./dist"
|
|
32
24
|
},
|
|
33
25
|
"dependencies": {
|
|
34
|
-
"@deephaven/chart": "^0.
|
|
35
|
-
"@deephaven/components": "^0.
|
|
36
|
-
"@deephaven/icons": "^0.
|
|
37
|
-
"@deephaven/jsapi-shim": "^0.
|
|
38
|
-
"@deephaven/log": "^0.
|
|
39
|
-
"@deephaven/storage": "^0.
|
|
40
|
-
"@deephaven/utils": "^0.
|
|
26
|
+
"@deephaven/chart": "^0.22.0",
|
|
27
|
+
"@deephaven/components": "^0.22.0",
|
|
28
|
+
"@deephaven/icons": "^0.22.0",
|
|
29
|
+
"@deephaven/jsapi-shim": "^0.22.0",
|
|
30
|
+
"@deephaven/log": "^0.22.0",
|
|
31
|
+
"@deephaven/storage": "^0.22.0",
|
|
32
|
+
"@deephaven/utils": "^0.22.0",
|
|
41
33
|
"@fortawesome/react-fontawesome": "^0.1.18",
|
|
42
34
|
"classnames": "^2.3.1",
|
|
43
35
|
"lodash.debounce": "^4.0.8",
|
|
@@ -55,8 +47,8 @@
|
|
|
55
47
|
"react-dom": "^17.x"
|
|
56
48
|
},
|
|
57
49
|
"devDependencies": {
|
|
58
|
-
"@deephaven/mocks": "^0.
|
|
59
|
-
"@deephaven/tsconfig": "^0.
|
|
50
|
+
"@deephaven/mocks": "^0.22.0",
|
|
51
|
+
"@deephaven/tsconfig": "^0.22.0"
|
|
60
52
|
},
|
|
61
53
|
"files": [
|
|
62
54
|
"dist"
|
|
@@ -67,5 +59,5 @@
|
|
|
67
59
|
"publishConfig": {
|
|
68
60
|
"access": "public"
|
|
69
61
|
},
|
|
70
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "c2f10a395058a78c527eb9e0e9750411279eebd2"
|
|
71
63
|
}
|