@jupyterlab/codemirror 4.0.7 → 4.0.8

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.
Files changed (7) hide show
  1. package/lib/extension.js +7 -3
  2. package/lib/extension.js.map +1 -1
  3. package/lib/extensions/rulers.js +7 -2
  4. package/lib/extensions/rulers.js.map +1 -1
  5. package/package.json +7 -7
  6. package/src/extension.ts +8 -2
  7. package/src/extensions/rulers.ts +9 -2
package/lib/extension.js CHANGED
@@ -1,9 +1,9 @@
1
1
  // Copyright (c) Jupyter Development Team.
2
2
  // Distributed under the terms of the Modified BSD License.
3
- import { closeBrackets } from '@codemirror/autocomplete';
3
+ import { closeBrackets, closeBracketsKeymap } from '@codemirror/autocomplete';
4
4
  import { defaultKeymap, indentLess } from '@codemirror/commands';
5
5
  import { bracketMatching, foldGutter, indentOnInput, indentUnit } from '@codemirror/language';
6
- import { Compartment, EditorState, StateEffect } from '@codemirror/state';
6
+ import { Compartment, EditorState, Prec, StateEffect } from '@codemirror/state';
7
7
  import { crosshairCursor, drawSelection, EditorView, highlightActiveLine, highlightTrailingWhitespace, highlightWhitespace, keymap, lineNumbers, rectangularSelection, scrollPastEnd, tooltips } from '@codemirror/view';
8
8
  import { nullTranslator } from '@jupyterlab/translation';
9
9
  import { JSONExt } from '@lumino/coreutils';
@@ -543,7 +543,11 @@ export class EditorExtensionRegistry {
543
543
  Object.freeze({
544
544
  name: 'matchBrackets',
545
545
  default: true,
546
- factory: () => createConditionalExtension(bracketMatching()),
546
+ factory: () => createConditionalExtension([
547
+ bracketMatching(),
548
+ // closeBracketsKeymap must have higher precedence over defaultKeymap
549
+ Prec.high(keymap.of(closeBracketsKeymap))
550
+ ]),
547
551
  schema: {
548
552
  type: 'boolean',
549
553
  title: trans.__('Match Brackets')
package/lib/extension.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":"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"}
package/lib/extensions/rulers.js CHANGED
@@ -30,6 +30,7 @@ const rulerConfig = Facet.define({
30
30
  */
31
31
  const plugin = ViewPlugin.fromClass(class {
32
32
  constructor(view) {
33
+ var _a, _b;
33
34
  this.rulersContainer = view.dom.appendChild(document.createElement('div'));
34
35
  this.rulersContainer.style.cssText = `
35
36
  position: absolute;
@@ -42,12 +43,13 @@ const plugin = ViewPlugin.fromClass(class {
42
43
  `;
43
44
  const defaultCharacterWidth = view.defaultCharacterWidth;
44
45
  const widths = view.state.facet(rulerConfig);
46
+ const guttersWidths = (_b = (_a = view.scrollDOM.querySelector('.cm-gutters')) === null || _a === void 0 ? void 0 : _a.clientWidth) !== null && _b !== void 0 ? _b : 0;
45
47
  this.rulers = widths.map(width => {
46
48
  const ruler = this.rulersContainer.appendChild(document.createElement('div'));
47
49
  ruler.classList.add(RULERS_CLASSNAME);
48
50
  ruler.style.cssText = `
49
51
  position: absolute;
50
- left: ${width * defaultCharacterWidth}px;
52
+ left: ${guttersWidths + width * defaultCharacterWidth}px;
51
53
  height: 100%;
52
54
  `;
53
55
  // FIXME: This should be equal to the amount of padding on a line.
@@ -57,12 +59,15 @@ const plugin = ViewPlugin.fromClass(class {
57
59
  });
58
60
  }
59
61
  update(update) {
62
+ var _a, _b;
60
63
  const widths = update.view.state.facet(rulerConfig);
61
64
  if (update.viewportChanged ||
65
+ update.geometryChanged ||
62
66
  !JSONExt.deepEqual(widths, update.startState.facet(rulerConfig))) {
67
+ const guttersWidth = (_b = (_a = update.view.scrollDOM.querySelector('.cm-gutters')) === null || _a === void 0 ? void 0 : _a.clientWidth) !== null && _b !== void 0 ? _b : 0;
63
68
  const defaultCharacterWidth = update.view.defaultCharacterWidth;
64
69
  this.rulers.forEach((ruler, rulerIdx) => {
65
- ruler.style.left = `${widths[rulerIdx] * defaultCharacterWidth}px`;
70
+ ruler.style.left = `${guttersWidth + widths[rulerIdx] * defaultCharacterWidth}px`;
66
71
  });
67
72
  }
68
73
  }
package/lib/extensions/rulers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rulers.js","sourceRoot":"","sources":["../../src/extensions/rulers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rulers.js","sourceRoot":"","sources":["../../src/extensions/rulers.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.0.7",
3
+ "version": "4.0.8",
4
4
  "description": "JupyterLab - CodeMirror Editor Provider",
5
5
  "homepage": "https://github.com/jupyterlab/jupyterlab",
6
6
  "bugs": {
@@ -59,11 +59,11 @@
59
59
  "@codemirror/state": "^6.2.0",
60
60
  "@codemirror/view": "^6.9.6",
61
61
  "@jupyter/ydoc": "^1.0.2",
62
- "@jupyterlab/codeeditor": "^4.0.7",
63
- "@jupyterlab/coreutils": "^6.0.7",
64
- "@jupyterlab/documentsearch": "^4.0.7",
65
- "@jupyterlab/nbformat": "^4.0.7",
66
- "@jupyterlab/translation": "^4.0.7",
62
+ "@jupyterlab/codeeditor": "^4.0.8",
63
+ "@jupyterlab/coreutils": "^6.0.8",
64
+ "@jupyterlab/documentsearch": "^4.0.8",
65
+ "@jupyterlab/nbformat": "^4.0.8",
66
+ "@jupyterlab/translation": "^4.0.8",
67
67
  "@lezer/common": "^1.0.2",
68
68
  "@lezer/generator": "^1.2.2",
69
69
  "@lezer/highlight": "^1.1.4",
@@ -74,7 +74,7 @@
74
74
  "yjs": "^13.5.40"
75
75
  },
76
76
  "devDependencies": {
77
- "@jupyterlab/testing": "^4.0.7",
77
+ "@jupyterlab/testing": "^4.0.8",
78
78
  "@lezer/generator": "^1.2.2",
79
79
  "@lezer/lr": "^1.3.3",
80
80
  "@types/jest": "^29.2.0",
package/src/extension.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  // Copyright (c) Jupyter Development Team.
2
2
  // Distributed under the terms of the Modified BSD License.
3
3
 
4
- import { closeBrackets } from '@codemirror/autocomplete';
4
+ import { closeBrackets, closeBracketsKeymap } from '@codemirror/autocomplete';
5
5
  import { defaultKeymap, indentLess } from '@codemirror/commands';
6
6
  import {
7
7
  bracketMatching,
@@ -13,6 +13,7 @@ import {
13
13
  Compartment,
14
14
  EditorState,
15
15
  Extension,
16
+ Prec,
16
17
  StateEffect
17
18
  } from '@codemirror/state';
18
19
  import {
@@ -715,7 +716,12 @@ export namespace EditorExtensionRegistry {
715
716
  Object.freeze({
716
717
  name: 'matchBrackets',
717
718
  default: true,
718
- factory: () => createConditionalExtension(bracketMatching()),
719
+ factory: () =>
720
+ createConditionalExtension([
721
+ bracketMatching(),
722
+ // closeBracketsKeymap must have higher precedence over defaultKeymap
723
+ Prec.high(keymap.of(closeBracketsKeymap))
724
+ ]),
719
725
  schema: {
720
726
  type: 'boolean',
721
727
  title: trans.__('Match Brackets')
package/src/extensions/rulers.ts CHANGED
@@ -57,6 +57,8 @@ const plugin = ViewPlugin.fromClass(
57
57
 
58
58
  const defaultCharacterWidth = view.defaultCharacterWidth;
59
59
  const widths = view.state.facet(rulerConfig);
60
+ const guttersWidths =
61
+ view.scrollDOM.querySelector('.cm-gutters')?.clientWidth ?? 0;
60
62
  this.rulers = widths.map(width => {
61
63
  const ruler = this.rulersContainer.appendChild(
62
64
  document.createElement('div')
@@ -64,7 +66,7 @@ const plugin = ViewPlugin.fromClass(
64
66
  ruler.classList.add(RULERS_CLASSNAME);
65
67
  ruler.style.cssText = `
66
68
  position: absolute;
67
- left: ${width * defaultCharacterWidth}px;
69
+ left: ${guttersWidths + width * defaultCharacterWidth}px;
68
70
  height: 100%;
69
71
  `;
70
72
  // FIXME: This should be equal to the amount of padding on a line.
@@ -80,11 +82,16 @@ const plugin = ViewPlugin.fromClass(
80
82
 
81
83
  if (
82
84
  update.viewportChanged ||
85
+ update.geometryChanged ||
83
86
  !JSONExt.deepEqual(widths, update.startState.facet(rulerConfig))
84
87
  ) {
88
+ const guttersWidth =
89
+ update.view.scrollDOM.querySelector('.cm-gutters')?.clientWidth ?? 0;
85
90
  const defaultCharacterWidth = update.view.defaultCharacterWidth;
86
91
  this.rulers.forEach((ruler, rulerIdx) => {
87
- ruler.style.left = `${widths[rulerIdx] * defaultCharacterWidth}px`;
92
+ ruler.style.left = `${
93
+ guttersWidth + widths[rulerIdx] * defaultCharacterWidth
94
+ }px`;
88
95
  });
89
96
  }
90
97
  }