@codemirror/state 0.20.0 → 0.20.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.20.1 (2022-06-02)
+
+### New features
+
+`EditorView.phrase` now accepts additional arguments, which it will interpolate into the phrase in the place of `$` markers.
+
 ## 0.20.0 (2022-04-20)
 
 ### Breaking changes

package/dist/index.cjs

@@ -690,9 +690,6 @@ class ChangeDesc {
     // unaffected sections, and the length of the replacement content
     // otherwise. So an insertion would be (0, n>0), a deletion (n>0,
     // 0), and a replacement two positive numbers.
-    /**
-    @internal
-    */
     constructor(
     /**
     @internal
@@ -847,6 +844,10 @@ class ChangeDesc {
             throw new RangeError("Invalid JSON representation of ChangeDesc");
         return new ChangeDesc(json);
     }
+    /**
+    @internal
+    */
+    static create(sections) { return new ChangeDesc(sections); }
 }
 /**
 A change set represents a group of modifications to a document. It
@@ -854,9 +855,6 @@ stores the document length, and can only be applied to documents
 with exactly that length.
 */
 class ChangeSet extends ChangeDesc {
-    /**
-    @internal
-    */
     constructor(sections, 
     /**
     @internal
@@ -935,7 +933,7 @@ class ChangeSet extends ChangeDesc {
     Get a [change description](https://codemirror.net/6/docs/ref/#state.ChangeDesc) for this change
     set.
     */
-    get desc() { return new ChangeDesc(this.sections); }
+    get desc() { return ChangeDesc.create(this.sections); }
     /**
     @internal
     */
@@ -968,7 +966,7 @@ class ChangeSet extends ChangeDesc {
             }
         }
         return { changes: new ChangeSet(resultSections, resultInserted),
-            filtered: new ChangeDesc(filteredSections) };
+            filtered: ChangeDesc.create(filteredSections) };
     }
     /**
     Serialize this change set to a JSON-representable value.
@@ -1070,6 +1068,12 @@ class ChangeSet extends ChangeDesc {
         }
         return new ChangeSet(sections, inserted);
     }
+    /**
+    @internal
+    */
+    static createSet(sections, inserted) {
+        return new ChangeSet(sections, inserted);
+    }
 }
 function addSection(sections, len, ins, forceJoin = false) {
     if (len == 0 && ins <= 0)
@@ -1173,7 +1177,7 @@ function mapSet(setA, setB, before, mkSet = false) {
             a.next();
         }
         else if (a.done && b.done) {
-            return insert ? new ChangeSet(sections, insert) : new ChangeDesc(sections);
+            return insert ? ChangeSet.createSet(sections, insert) : ChangeDesc.create(sections);
         }
         else {
             throw new Error("Mismatched change set lengths");
@@ -1186,7 +1190,7 @@ function composeSets(setA, setB, mkSet = false) {
     let a = new SectionIter(setA), b = new SectionIter(setB);
     for (let open = false;;) {
         if (a.done && b.done) {
-            return insert ? new ChangeSet(sections, insert) : new ChangeDesc(sections);
+            return insert ? ChangeSet.createSet(sections, insert) : ChangeDesc.create(sections);
         }
         else if (a.ins == 0) { // Deletion in A
             addSection(sections, a.len, 0, open);
@@ -1281,9 +1285,6 @@ is enabled, a [selection](https://codemirror.net/6/docs/ref/#state.EditorSelecti
 multiple ranges. By default, selections hold exactly one range.
 */
 class SelectionRange {
-    /**
-    @internal
-    */
     constructor(
     /**
     The lower boundary of the range.
@@ -1379,14 +1380,17 @@ class SelectionRange {
             throw new RangeError("Invalid JSON representation for SelectionRange");
         return EditorSelection.range(json.anchor, json.head);
     }
+    /**
+    @internal
+    */
+    static create(from, to, flags) {
+        return new SelectionRange(from, to, flags);
+    }
 }
 /**
 An editor selection holds one or more selection ranges.
 */
 class EditorSelection {
-    /**
-    @internal
-    */
     constructor(
     /**
     The ranges in the selection, sorted by position. Ranges cannot
@@ -1397,7 +1401,7 @@ class EditorSelection {
     The index of the _main_ range in the selection (which is
     usually the range that was added last).
     */
-    mainIndex = 0) {
+    mainIndex) {
         this.ranges = ranges;
         this.mainIndex = mainIndex;
     }
@@ -1433,7 +1437,7 @@ class EditorSelection {
     holding only the main range from this selection.
     */
     asSingle() {
-        return this.ranges.length == 1 ? this : new EditorSelection([this.main]);
+        return this.ranges.length == 1 ? this : new EditorSelection([this.main], 0);
     }
     /**
     Extend this selection with an extra range.
@@ -1481,7 +1485,7 @@ class EditorSelection {
         for (let pos = 0, i = 0; i < ranges.length; i++) {
             let range = ranges[i];
             if (range.empty ? range.from <= pos : range.from < pos)
-                return normalized(ranges.slice(), mainIndex);
+                return EditorSelection.normalized(ranges.slice(), mainIndex);
             pos = range.to;
         }
         return new EditorSelection(ranges, mainIndex);
@@ -1491,7 +1495,7 @@ class EditorSelection {
     safely ignore the optional arguments in most situations.
     */
     static cursor(pos, assoc = 0, bidiLevel, goalColumn) {
-        return new SelectionRange(pos, pos, (assoc == 0 ? 0 : assoc < 0 ? 4 /* AssocBefore */ : 8 /* AssocAfter */) |
+        return SelectionRange.create(pos, pos, (assoc == 0 ? 0 : assoc < 0 ? 4 /* AssocBefore */ : 8 /* AssocAfter */) |
             (bidiLevel == null ? 3 : Math.min(2, bidiLevel)) |
             ((goalColumn !== null && goalColumn !== void 0 ? goalColumn : 33554431 /* NoGoalColumn */) << 5 /* GoalColumnOffset */));
     }
@@ -1500,24 +1504,27 @@ class EditorSelection {
     */
     static range(anchor, head, goalColumn) {
         let goal = (goalColumn !== null && goalColumn !== void 0 ? goalColumn : 33554431 /* NoGoalColumn */) << 5 /* GoalColumnOffset */;
-        return head < anchor ? new SelectionRange(head, anchor, 16 /* Inverted */ | goal | 8 /* AssocAfter */)
-            : new SelectionRange(anchor, head, goal | (head > anchor ? 4 /* AssocBefore */ : 0));
+        return head < anchor ? SelectionRange.create(head, anchor, 16 /* Inverted */ | goal | 8 /* AssocAfter */)
+            : SelectionRange.create(anchor, head, goal | (head > anchor ? 4 /* AssocBefore */ : 0));
     }
-}
-function normalized(ranges, mainIndex = 0) {
-    let main = ranges[mainIndex];
-    ranges.sort((a, b) => a.from - b.from);
-    mainIndex = ranges.indexOf(main);
-    for (let i = 1; i < ranges.length; i++) {
-        let range = ranges[i], prev = ranges[i - 1];
-        if (range.empty ? range.from <= prev.to : range.from < prev.to) {
-            let from = prev.from, to = Math.max(range.to, prev.to);
-            if (i <= mainIndex)
-                mainIndex--;
-            ranges.splice(--i, 2, range.anchor > range.head ? EditorSelection.range(to, from) : EditorSelection.range(from, to));
+    /**
+    @internal
+    */
+    static normalized(ranges, mainIndex = 0) {
+        let main = ranges[mainIndex];
+        ranges.sort((a, b) => a.from - b.from);
+        mainIndex = ranges.indexOf(main);
+        for (let i = 1; i < ranges.length; i++) {
+            let range = ranges[i], prev = ranges[i - 1];
+            if (range.empty ? range.from <= prev.to : range.from < prev.to) {
+                let from = prev.from, to = Math.max(range.to, prev.to);
+                if (i <= mainIndex)
+                    mainIndex--;
+                ranges.splice(--i, 2, range.anchor > range.head ? EditorSelection.range(to, from) : EditorSelection.range(from, to));
+            }
         }
+        return new EditorSelection(ranges, mainIndex);
     }
-    return new EditorSelection(ranges, mainIndex);
 }
 function checkSelection(selection, docLength) {
     for (let range of selection.ranges)
@@ -2183,9 +2190,6 @@ dispatch one by calling
 [`EditorView.dispatch`](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch).
 */
 class Transaction {
-    /**
-    @internal
-    */
     constructor(
     /**
     The state from which the transaction starts.
@@ -2233,6 +2237,12 @@ class Transaction {
             this.annotations = annotations.concat(Transaction.time.of(Date.now()));
     }
     /**
+    @internal
+    */
+    static create(startState, changes, selection, effects, annotations, scrollIntoView) {
+        return new Transaction(startState, changes, selection, effects, annotations, scrollIntoView);
+    }
+    /**
     The new document produced by the transaction. Contrary to
     [`.state`](https://codemirror.net/6/docs/ref/#state.Transaction.state)`.doc`, accessing this won't
     force the entire new state to be computed right away, so it is
@@ -2403,7 +2413,7 @@ function resolveTransaction(state, specs, filter) {
         let seq = !!specs[i].sequential;
         s = mergeTransaction(s, resolveTransactionInner(state, specs[i], seq ? s.changes.newLength : state.doc.length), seq);
     }
-    let tr = new Transaction(state, s.changes, s.selection, s.effects, s.annotations, s.scrollIntoView);
+    let tr = Transaction.create(state, s.changes, s.selection, s.effects, s.annotations, s.scrollIntoView);
     return extendTransaction(filter ? filterTransaction(tr) : tr);
 }
 // Finish a transaction by applying filters if necessary.
@@ -2431,7 +2441,7 @@ function filterTransaction(tr) {
             changes = filtered.changes;
             back = filtered.filtered.invertedDesc;
         }
-        tr = new Transaction(state, changes, tr.selection && tr.selection.map(back), StateEffect.mapEffects(tr.effects, back), tr.annotations, tr.scrollIntoView);
+        tr = Transaction.create(state, changes, tr.selection && tr.selection.map(back), StateEffect.mapEffects(tr.effects, back), tr.annotations, tr.scrollIntoView);
     }
     // Transaction filters
     let filters = state.facet(transactionFilter);
@@ -2453,7 +2463,7 @@ function extendTransaction(tr) {
         if (extension && Object.keys(extension).length)
             spec = mergeTransaction(tr, resolveTransactionInner(state, extension, tr.changes.newLength), true);
     }
-    return spec == tr ? tr : new Transaction(state, tr.changes, tr.selection, spec.effects, spec.annotations, spec.scrollIntoView);
+    return spec == tr ? tr : Transaction.create(state, tr.changes, tr.selection, spec.effects, spec.annotations, spec.scrollIntoView);
 }
 const none = [];
 function asArray(value) {
@@ -2519,9 +2529,6 @@ As such, _never_ mutate properties of a state directly. That'll
 just break things.
 */
 class EditorState {
-    /**
-    @internal
-    */
     constructor(
     /**
     @internal
@@ -2767,11 +2774,25 @@ class EditorState {
     Look up a translation for the given phrase (via the
     [`phrases`](https://codemirror.net/6/docs/ref/#state.EditorState^phrases) facet), or return the
     original string if no translation is found.
+    
+    If additional arguments are passed, they will be inserted in
+    place of markers like `$1` (for the first value) and `$2`, etc.
+    A single `$` is equivalent to `$1`, and `$$` will produce a
+    literal dollar sign.
     */
-    phrase(phrase) {
+    phrase(phrase, ...insert) {
         for (let map of this.facet(EditorState.phrases))
-            if (Object.prototype.hasOwnProperty.call(map, phrase))
-                return map[phrase];
+            if (Object.prototype.hasOwnProperty.call(map, phrase)) {
+                phrase = map[phrase];
+                break;
+            }
+        if (insert.length)
+            phrase = phrase.replace(/\$(\$|\d*)/g, (m, i) => {
+                if (i == "$")
+                    return "$";
+                let n = +(i || 1);
+                return n > insert.length ? m : insert[n - 1];
+            });
         return phrase;
     }
     /**
@@ -2981,7 +3002,7 @@ class RangeValue {
     /**
     Create a [range](https://codemirror.net/6/docs/ref/#state.Range) with this value.
     */
-    range(from, to = from) { return new Range(from, to, this); }
+    range(from, to = from) { return Range.create(from, to, this); }
 }
 RangeValue.prototype.startSide = RangeValue.prototype.endSide = 0;
 RangeValue.prototype.point = false;
@@ -2990,9 +3011,6 @@ RangeValue.prototype.mapMode = exports.MapMode.TrackDel;
 A range associates a value with a range of positions.
 */
 class Range {
-    /**
-    @internal
-    */
     constructor(
     /**
     The range's start position.
@@ -3010,6 +3028,12 @@ class Range {
         this.to = to;
         this.value = value;
     }
+    /**
+    @internal
+    */
+    static create(from, to, value) {
+        return new Range(from, to, value);
+    }
 }
 function cmpRange(a, b) {
     return a.from - b.from || a.value.startSide - b.value.startSide;
@@ -3090,9 +3114,6 @@ way that makes them efficient to [map](https://codemirror.net/6/docs/ref/#state.
 structure.
 */
 class RangeSet {
-    /**
-    @internal
-    */
     constructor(
     /**
     @internal
@@ -3105,7 +3126,7 @@ class RangeSet {
     /**
     @internal
     */
-    nextLayer = RangeSet.empty, 
+    nextLayer, 
     /**
     @internal
     */
@@ -3118,6 +3139,12 @@ class RangeSet {
     /**
     @internal
     */
+    static create(chunkPos, chunk, nextLayer, maxPoint) {
+        return new RangeSet(chunkPos, chunk, nextLayer, maxPoint);
+    }
+    /**
+    @internal
+    */
     get length() {
         let last = this.chunk.length - 1;
         return last < 0 ? 0 : Math.max(this.chunkEnd(last), this.nextLayer.length);
@@ -3174,7 +3201,7 @@ class RangeSet {
             else {
                 if (!filter || filterFrom > cur.to || filterTo < cur.from || filter(cur.from, cur.to, cur.value)) {
                     if (!builder.addInner(cur.from, cur.to, cur.value))
-                        spill.push(new Range(cur.from, cur.to, cur.value));
+                        spill.push(Range.create(cur.from, cur.to, cur.value));
                 }
                 cur.next();
             }
@@ -3207,7 +3234,7 @@ class RangeSet {
             }
         }
         let next = this.nextLayer.map(changes);
-        return chunks.length == 0 ? next : new RangeSet(chunkPos, chunks, next, maxPoint);
+        return chunks.length == 0 ? next : new RangeSet(chunkPos, chunks, next || RangeSet.empty, maxPoint);
     }
     /**
     Iterate over the ranges that touch the region `from` to `to`,
@@ -3452,7 +3479,7 @@ class RangeSetBuilder {
             this.finishChunk(false);
         if (this.chunks.length == 0)
             return next;
-        let result = new RangeSet(this.chunkPos, this.chunks, this.nextLayer ? this.nextLayer.finishInner(next) : next, this.setMaxPoint);
+        let result = RangeSet.create(this.chunkPos, this.chunks, this.nextLayer ? this.nextLayer.finishInner(next) : next, this.setMaxPoint);
         this.from = null; // Make sure further `add` calls produce errors
         return result;
     }

package/dist/index.d.ts

@@ -160,6 +160,11 @@ that doesn't store the inserted text. As such, it can't be
 applied, but is cheaper to store and manipulate.
 */
 declare class ChangeDesc {
+    protected constructor(
+    /**
+    @internal
+    */
+    sections: readonly number[]);
     /**
     The length of the document before the change.
     */
@@ -263,6 +268,7 @@ stores the document length, and can only be applied to documents
 with exactly that length.
 */
 declare class ChangeSet extends ChangeDesc {
+    private constructor();
     /**
     Apply the changes to a document, returning the modified
     document.
@@ -348,6 +354,7 @@ declare class SelectionRange {
     */
     readonly to: number;
     private flags;
+    private constructor();
     /**
     The anchor of the range—the side that doesn't move when you
     extend it.
@@ -418,6 +425,7 @@ declare class EditorSelection {
     usually the range that was added last).
     */
     readonly mainIndex: number;
+    private constructor();
     /**
     Map a selection through a change. Used to adjust the selection
     position for changes.
@@ -885,6 +893,7 @@ declare class Transaction {
     transaction is dispatched.
     */
     readonly scrollIntoView: boolean;
+    private constructor();
     /**
     The new document produced by the transaction. Contrary to
     [`.state`](https://codemirror.net/6/docs/ref/#state.Transaction.state)`.doc`, accessing this won't
@@ -1042,6 +1051,7 @@ declare class EditorState {
     The current selection.
     */
     readonly selection: EditorSelection;
+    private constructor();
     /**
     Retrieve the value of a [state field](https://codemirror.net/6/docs/ref/#state.StateField). Throws
     an error when the state doesn't have that field, unless you pass
@@ -1203,8 +1213,13 @@ declare class EditorState {
     Look up a translation for the given phrase (via the
     [`phrases`](https://codemirror.net/6/docs/ref/#state.EditorState^phrases) facet), or return the
     original string if no translation is found.
+    
+    If additional arguments are passed, they will be inserted in
+    place of markers like `$1` (for the first value) and `$2`, etc.
+    A single `$` is equivalent to `$1`, and `$$` will produce a
+    literal dollar sign.
     */
-    phrase(phrase: string): string;
+    phrase(phrase: string, ...insert: any[]): string;
     /**
     A facet used to register [language
     data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) providers.
@@ -1371,6 +1386,7 @@ declare class Range<T extends RangeValue> {
     The value associated with this range.
     */
     readonly value: T;
+    private constructor();
 }
 /**
 Collection of methods used when comparing range sets.
@@ -1471,6 +1487,7 @@ way that makes them efficient to [map](https://codemirror.net/6/docs/ref/#state.
 structure.
 */
 declare class RangeSet<T extends RangeValue> {
+    private constructor();
     /**
     The number of ranges in the set.
     */

package/dist/index.js

@@ -685,9 +685,6 @@ class ChangeDesc {
     // unaffected sections, and the length of the replacement content
     // otherwise. So an insertion would be (0, n>0), a deletion (n>0,
     // 0), and a replacement two positive numbers.
-    /**
-    @internal
-    */
     constructor(
     /**
     @internal
@@ -842,6 +839,10 @@ class ChangeDesc {
             throw new RangeError("Invalid JSON representation of ChangeDesc");
         return new ChangeDesc(json);
     }
+    /**
+    @internal
+    */
+    static create(sections) { return new ChangeDesc(sections); }
 }
 /**
 A change set represents a group of modifications to a document. It
@@ -849,9 +850,6 @@ stores the document length, and can only be applied to documents
 with exactly that length.
 */
 class ChangeSet extends ChangeDesc {
-    /**
-    @internal
-    */
     constructor(sections, 
     /**
     @internal
@@ -930,7 +928,7 @@ class ChangeSet extends ChangeDesc {
     Get a [change description](https://codemirror.net/6/docs/ref/#state.ChangeDesc) for this change
     set.
     */
-    get desc() { return new ChangeDesc(this.sections); }
+    get desc() { return ChangeDesc.create(this.sections); }
     /**
     @internal
     */
@@ -963,7 +961,7 @@ class ChangeSet extends ChangeDesc {
             }
         }
         return { changes: new ChangeSet(resultSections, resultInserted),
-            filtered: new ChangeDesc(filteredSections) };
+            filtered: ChangeDesc.create(filteredSections) };
     }
     /**
     Serialize this change set to a JSON-representable value.
@@ -1065,6 +1063,12 @@ class ChangeSet extends ChangeDesc {
         }
         return new ChangeSet(sections, inserted);
     }
+    /**
+    @internal
+    */
+    static createSet(sections, inserted) {
+        return new ChangeSet(sections, inserted);
+    }
 }
 function addSection(sections, len, ins, forceJoin = false) {
     if (len == 0 && ins <= 0)
@@ -1168,7 +1172,7 @@ function mapSet(setA, setB, before, mkSet = false) {
             a.next();
         }
         else if (a.done && b.done) {
-            return insert ? new ChangeSet(sections, insert) : new ChangeDesc(sections);
+            return insert ? ChangeSet.createSet(sections, insert) : ChangeDesc.create(sections);
         }
         else {
             throw new Error("Mismatched change set lengths");
@@ -1181,7 +1185,7 @@ function composeSets(setA, setB, mkSet = false) {
     let a = new SectionIter(setA), b = new SectionIter(setB);
     for (let open = false;;) {
         if (a.done && b.done) {
-            return insert ? new ChangeSet(sections, insert) : new ChangeDesc(sections);
+            return insert ? ChangeSet.createSet(sections, insert) : ChangeDesc.create(sections);
         }
         else if (a.ins == 0) { // Deletion in A
             addSection(sections, a.len, 0, open);
@@ -1276,9 +1280,6 @@ is enabled, a [selection](https://codemirror.net/6/docs/ref/#state.EditorSelecti
 multiple ranges. By default, selections hold exactly one range.
 */
 class SelectionRange {
-    /**
-    @internal
-    */
     constructor(
     /**
     The lower boundary of the range.
@@ -1374,14 +1375,17 @@ class SelectionRange {
             throw new RangeError("Invalid JSON representation for SelectionRange");
         return EditorSelection.range(json.anchor, json.head);
     }
+    /**
+    @internal
+    */
+    static create(from, to, flags) {
+        return new SelectionRange(from, to, flags);
+    }
 }
 /**
 An editor selection holds one or more selection ranges.
 */
 class EditorSelection {
-    /**
-    @internal
-    */
     constructor(
     /**
     The ranges in the selection, sorted by position. Ranges cannot
@@ -1392,7 +1396,7 @@ class EditorSelection {
     The index of the _main_ range in the selection (which is
     usually the range that was added last).
     */
-    mainIndex = 0) {
+    mainIndex) {
         this.ranges = ranges;
         this.mainIndex = mainIndex;
     }
@@ -1428,7 +1432,7 @@ class EditorSelection {
     holding only the main range from this selection.
     */
     asSingle() {
-        return this.ranges.length == 1 ? this : new EditorSelection([this.main]);
+        return this.ranges.length == 1 ? this : new EditorSelection([this.main], 0);
     }
     /**
     Extend this selection with an extra range.
@@ -1476,7 +1480,7 @@ class EditorSelection {
         for (let pos = 0, i = 0; i < ranges.length; i++) {
             let range = ranges[i];
             if (range.empty ? range.from <= pos : range.from < pos)
-                return normalized(ranges.slice(), mainIndex);
+                return EditorSelection.normalized(ranges.slice(), mainIndex);
             pos = range.to;
         }
         return new EditorSelection(ranges, mainIndex);
@@ -1486,7 +1490,7 @@ class EditorSelection {
     safely ignore the optional arguments in most situations.
     */
     static cursor(pos, assoc = 0, bidiLevel, goalColumn) {
-        return new SelectionRange(pos, pos, (assoc == 0 ? 0 : assoc < 0 ? 4 /* AssocBefore */ : 8 /* AssocAfter */) |
+        return SelectionRange.create(pos, pos, (assoc == 0 ? 0 : assoc < 0 ? 4 /* AssocBefore */ : 8 /* AssocAfter */) |
             (bidiLevel == null ? 3 : Math.min(2, bidiLevel)) |
             ((goalColumn !== null && goalColumn !== void 0 ? goalColumn : 33554431 /* NoGoalColumn */) << 5 /* GoalColumnOffset */));
     }
@@ -1495,24 +1499,27 @@ class EditorSelection {
     */
     static range(anchor, head, goalColumn) {
         let goal = (goalColumn !== null && goalColumn !== void 0 ? goalColumn : 33554431 /* NoGoalColumn */) << 5 /* GoalColumnOffset */;
-        return head < anchor ? new SelectionRange(head, anchor, 16 /* Inverted */ | goal | 8 /* AssocAfter */)
-            : new SelectionRange(anchor, head, goal | (head > anchor ? 4 /* AssocBefore */ : 0));
+        return head < anchor ? SelectionRange.create(head, anchor, 16 /* Inverted */ | goal | 8 /* AssocAfter */)
+            : SelectionRange.create(anchor, head, goal | (head > anchor ? 4 /* AssocBefore */ : 0));
     }
-}
-function normalized(ranges, mainIndex = 0) {
-    let main = ranges[mainIndex];
-    ranges.sort((a, b) => a.from - b.from);
-    mainIndex = ranges.indexOf(main);
-    for (let i = 1; i < ranges.length; i++) {
-        let range = ranges[i], prev = ranges[i - 1];
-        if (range.empty ? range.from <= prev.to : range.from < prev.to) {
-            let from = prev.from, to = Math.max(range.to, prev.to);
-            if (i <= mainIndex)
-                mainIndex--;
-            ranges.splice(--i, 2, range.anchor > range.head ? EditorSelection.range(to, from) : EditorSelection.range(from, to));
+    /**
+    @internal
+    */
+    static normalized(ranges, mainIndex = 0) {
+        let main = ranges[mainIndex];
+        ranges.sort((a, b) => a.from - b.from);
+        mainIndex = ranges.indexOf(main);
+        for (let i = 1; i < ranges.length; i++) {
+            let range = ranges[i], prev = ranges[i - 1];
+            if (range.empty ? range.from <= prev.to : range.from < prev.to) {
+                let from = prev.from, to = Math.max(range.to, prev.to);
+                if (i <= mainIndex)
+                    mainIndex--;
+                ranges.splice(--i, 2, range.anchor > range.head ? EditorSelection.range(to, from) : EditorSelection.range(from, to));
+            }
         }
+        return new EditorSelection(ranges, mainIndex);
     }
-    return new EditorSelection(ranges, mainIndex);
 }
 function checkSelection(selection, docLength) {
     for (let range of selection.ranges)
@@ -2178,9 +2185,6 @@ dispatch one by calling
 [`EditorView.dispatch`](https://codemirror.net/6/docs/ref/#view.EditorView.dispatch).
 */
 class Transaction {
-    /**
-    @internal
-    */
     constructor(
     /**
     The state from which the transaction starts.
@@ -2228,6 +2232,12 @@ class Transaction {
             this.annotations = annotations.concat(Transaction.time.of(Date.now()));
     }
     /**
+    @internal
+    */
+    static create(startState, changes, selection, effects, annotations, scrollIntoView) {
+        return new Transaction(startState, changes, selection, effects, annotations, scrollIntoView);
+    }
+    /**
     The new document produced by the transaction. Contrary to
     [`.state`](https://codemirror.net/6/docs/ref/#state.Transaction.state)`.doc`, accessing this won't
     force the entire new state to be computed right away, so it is
@@ -2398,7 +2408,7 @@ function resolveTransaction(state, specs, filter) {
         let seq = !!specs[i].sequential;
         s = mergeTransaction(s, resolveTransactionInner(state, specs[i], seq ? s.changes.newLength : state.doc.length), seq);
     }
-    let tr = new Transaction(state, s.changes, s.selection, s.effects, s.annotations, s.scrollIntoView);
+    let tr = Transaction.create(state, s.changes, s.selection, s.effects, s.annotations, s.scrollIntoView);
     return extendTransaction(filter ? filterTransaction(tr) : tr);
 }
 // Finish a transaction by applying filters if necessary.
@@ -2426,7 +2436,7 @@ function filterTransaction(tr) {
             changes = filtered.changes;
             back = filtered.filtered.invertedDesc;
         }
-        tr = new Transaction(state, changes, tr.selection && tr.selection.map(back), StateEffect.mapEffects(tr.effects, back), tr.annotations, tr.scrollIntoView);
+        tr = Transaction.create(state, changes, tr.selection && tr.selection.map(back), StateEffect.mapEffects(tr.effects, back), tr.annotations, tr.scrollIntoView);
     }
     // Transaction filters
     let filters = state.facet(transactionFilter);
@@ -2448,7 +2458,7 @@ function extendTransaction(tr) {
         if (extension && Object.keys(extension).length)
             spec = mergeTransaction(tr, resolveTransactionInner(state, extension, tr.changes.newLength), true);
     }
-    return spec == tr ? tr : new Transaction(state, tr.changes, tr.selection, spec.effects, spec.annotations, spec.scrollIntoView);
+    return spec == tr ? tr : Transaction.create(state, tr.changes, tr.selection, spec.effects, spec.annotations, spec.scrollIntoView);
 }
 const none = [];
 function asArray(value) {
@@ -2513,9 +2523,6 @@ As such, _never_ mutate properties of a state directly. That'll
 just break things.
 */
 class EditorState {
-    /**
-    @internal
-    */
     constructor(
     /**
     @internal
@@ -2761,11 +2768,25 @@ class EditorState {
     Look up a translation for the given phrase (via the
     [`phrases`](https://codemirror.net/6/docs/ref/#state.EditorState^phrases) facet), or return the
     original string if no translation is found.
+    
+    If additional arguments are passed, they will be inserted in
+    place of markers like `$1` (for the first value) and `$2`, etc.
+    A single `$` is equivalent to `$1`, and `$$` will produce a
+    literal dollar sign.
     */
-    phrase(phrase) {
+    phrase(phrase, ...insert) {
         for (let map of this.facet(EditorState.phrases))
-            if (Object.prototype.hasOwnProperty.call(map, phrase))
-                return map[phrase];
+            if (Object.prototype.hasOwnProperty.call(map, phrase)) {
+                phrase = map[phrase];
+                break;
+            }
+        if (insert.length)
+            phrase = phrase.replace(/\$(\$|\d*)/g, (m, i) => {
+                if (i == "$")
+                    return "$";
+                let n = +(i || 1);
+                return n > insert.length ? m : insert[n - 1];
+            });
         return phrase;
     }
     /**
@@ -2975,7 +2996,7 @@ class RangeValue {
     /**
     Create a [range](https://codemirror.net/6/docs/ref/#state.Range) with this value.
     */
-    range(from, to = from) { return new Range(from, to, this); }
+    range(from, to = from) { return Range.create(from, to, this); }
 }
 RangeValue.prototype.startSide = RangeValue.prototype.endSide = 0;
 RangeValue.prototype.point = false;
@@ -2984,9 +3005,6 @@ RangeValue.prototype.mapMode = MapMode.TrackDel;
 A range associates a value with a range of positions.
 */
 class Range {
-    /**
-    @internal
-    */
     constructor(
     /**
     The range's start position.
@@ -3004,6 +3022,12 @@ class Range {
         this.to = to;
         this.value = value;
     }
+    /**
+    @internal
+    */
+    static create(from, to, value) {
+        return new Range(from, to, value);
+    }
 }
 function cmpRange(a, b) {
     return a.from - b.from || a.value.startSide - b.value.startSide;
@@ -3084,9 +3108,6 @@ way that makes them efficient to [map](https://codemirror.net/6/docs/ref/#state.
 structure.
 */
 class RangeSet {
-    /**
-    @internal
-    */
     constructor(
     /**
     @internal
@@ -3099,7 +3120,7 @@ class RangeSet {
     /**
     @internal
     */
-    nextLayer = RangeSet.empty, 
+    nextLayer, 
     /**
     @internal
     */
@@ -3112,6 +3133,12 @@ class RangeSet {
     /**
     @internal
     */
+    static create(chunkPos, chunk, nextLayer, maxPoint) {
+        return new RangeSet(chunkPos, chunk, nextLayer, maxPoint);
+    }
+    /**
+    @internal
+    */
     get length() {
         let last = this.chunk.length - 1;
         return last < 0 ? 0 : Math.max(this.chunkEnd(last), this.nextLayer.length);
@@ -3168,7 +3195,7 @@ class RangeSet {
             else {
                 if (!filter || filterFrom > cur.to || filterTo < cur.from || filter(cur.from, cur.to, cur.value)) {
                     if (!builder.addInner(cur.from, cur.to, cur.value))
-                        spill.push(new Range(cur.from, cur.to, cur.value));
+                        spill.push(Range.create(cur.from, cur.to, cur.value));
                 }
                 cur.next();
             }
@@ -3201,7 +3228,7 @@ class RangeSet {
             }
         }
         let next = this.nextLayer.map(changes);
-        return chunks.length == 0 ? next : new RangeSet(chunkPos, chunks, next, maxPoint);
+        return chunks.length == 0 ? next : new RangeSet(chunkPos, chunks, next || RangeSet.empty, maxPoint);
     }
     /**
     Iterate over the ranges that touch the region `from` to `to`,
@@ -3446,7 +3473,7 @@ class RangeSetBuilder {
             this.finishChunk(false);
         if (this.chunks.length == 0)
             return next;
-        let result = new RangeSet(this.chunkPos, this.chunks, this.nextLayer ? this.nextLayer.finishInner(next) : next, this.setMaxPoint);
+        let result = RangeSet.create(this.chunkPos, this.chunks, this.nextLayer ? this.nextLayer.finishInner(next) : next, this.setMaxPoint);
         this.from = null; // Make sure further `add` calls produce errors
         return result;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/state",
-  "version": "0.20.0",
+  "version": "0.20.1",
   "description": "Editor state data structures for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",