@jupyterlab/codemirror 4.3.0-rc.1 → 4.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commands.js +5 -2
- package/lib/commands.js.map +1 -1
- package/package.json +8 -8
- package/src/commands.ts +6 -2
package/lib/commands.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Distributed under the terms of the Modified BSD License.
|
|
4
4
|
*/
|
|
5
5
|
import { indentLess, indentMore, insertBlankLine, insertNewlineAndIndent, insertTab, simplifySelection } from '@codemirror/commands';
|
|
6
|
-
import { COMPLETER_ACTIVE_CLASS, COMPLETER_ENABLED_CLASS } from '@jupyterlab/codeeditor';
|
|
6
|
+
import { COMPLETER_ACTIVE_CLASS, COMPLETER_ENABLED_CLASS, COMPLETER_LINE_BEGINNING_CLASS } from '@jupyterlab/codeeditor';
|
|
7
7
|
/**
|
|
8
8
|
* Selector for a widget that can run code.
|
|
9
9
|
*/
|
|
@@ -30,7 +30,10 @@ export var StateCommands;
|
|
|
30
30
|
*/
|
|
31
31
|
function indentMoreOrInsertTab(target) {
|
|
32
32
|
var _a;
|
|
33
|
-
|
|
33
|
+
let classList = (_a = target.dom.parentElement) === null || _a === void 0 ? void 0 : _a.classList;
|
|
34
|
+
let completerEnabled = classList === null || classList === void 0 ? void 0 : classList.contains(COMPLETER_ENABLED_CLASS);
|
|
35
|
+
let lineBeggining = classList === null || classList === void 0 ? void 0 : classList.contains(COMPLETER_LINE_BEGINNING_CLASS);
|
|
36
|
+
if (completerEnabled && !lineBeggining) {
|
|
34
37
|
return false;
|
|
35
38
|
}
|
|
36
39
|
const arg = { state: target.state, dispatch: target.dispatch };
|
package/lib/commands.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,sBAAsB,EACtB,SAAS,EACT,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,sBAAsB,EACtB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/codemirror",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.1",
|
|
4
4
|
"description": "JupyterLab - CodeMirror Editor Provider",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -57,12 +57,12 @@
|
|
|
57
57
|
"@codemirror/search": "^6.5.6",
|
|
58
58
|
"@codemirror/state": "^6.4.1",
|
|
59
59
|
"@codemirror/view": "^6.26.3",
|
|
60
|
-
"@jupyter/ydoc": "^3.0.0
|
|
61
|
-
"@jupyterlab/codeeditor": "^4.3.
|
|
62
|
-
"@jupyterlab/coreutils": "^6.3.
|
|
63
|
-
"@jupyterlab/documentsearch": "^4.3.
|
|
64
|
-
"@jupyterlab/nbformat": "^4.3.
|
|
65
|
-
"@jupyterlab/translation": "^4.3.
|
|
60
|
+
"@jupyter/ydoc": "^3.0.0",
|
|
61
|
+
"@jupyterlab/codeeditor": "^4.3.1",
|
|
62
|
+
"@jupyterlab/coreutils": "^6.3.1",
|
|
63
|
+
"@jupyterlab/documentsearch": "^4.3.1",
|
|
64
|
+
"@jupyterlab/nbformat": "^4.3.1",
|
|
65
|
+
"@jupyterlab/translation": "^4.3.1",
|
|
66
66
|
"@lezer/common": "^1.2.1",
|
|
67
67
|
"@lezer/generator": "^1.7.0",
|
|
68
68
|
"@lezer/highlight": "^1.2.0",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"yjs": "^13.5.40"
|
|
74
74
|
},
|
|
75
75
|
"devDependencies": {
|
|
76
|
-
"@jupyterlab/testing": "^4.3.
|
|
76
|
+
"@jupyterlab/testing": "^4.3.1",
|
|
77
77
|
"@lezer/generator": "^1.7.0",
|
|
78
78
|
"@lezer/lr": "^1.4.0",
|
|
79
79
|
"@types/jest": "^29.2.0",
|
package/src/commands.ts
CHANGED
|
@@ -14,7 +14,8 @@ import {
|
|
|
14
14
|
import { EditorState, Transaction } from '@codemirror/state';
|
|
15
15
|
import {
|
|
16
16
|
COMPLETER_ACTIVE_CLASS,
|
|
17
|
-
COMPLETER_ENABLED_CLASS
|
|
17
|
+
COMPLETER_ENABLED_CLASS,
|
|
18
|
+
COMPLETER_LINE_BEGINNING_CLASS
|
|
18
19
|
} from '@jupyterlab/codeeditor';
|
|
19
20
|
|
|
20
21
|
/**
|
|
@@ -51,7 +52,10 @@ export namespace StateCommands {
|
|
|
51
52
|
state: EditorState;
|
|
52
53
|
dispatch: (transaction: Transaction) => void;
|
|
53
54
|
}): boolean {
|
|
54
|
-
|
|
55
|
+
let classList = target.dom.parentElement?.classList;
|
|
56
|
+
let completerEnabled = classList?.contains(COMPLETER_ENABLED_CLASS);
|
|
57
|
+
let lineBeggining = classList?.contains(COMPLETER_LINE_BEGINNING_CLASS);
|
|
58
|
+
if (completerEnabled && !lineBeggining) {
|
|
55
59
|
return false;
|
|
56
60
|
}
|
|
57
61
|
|