@adecore/editor 0.43.0 → 0.44.1

package/dist/controller.js

@@ -336,6 +336,7 @@ export class InputController {
             indentGuides: settings.guides,
             smartSemicolon: keys.smartSemicolon,
             smartArrow: keys.smartArrow,
+            templateLiterals: keys.templateLiterals,
             language: settings.language ?? 'plaintext',
             camelCase: keys.camelHumps,
             visualLine: (offset) => this.view.rowOf(offset),

package/dist/engine.js

@@ -1,5 +1,6 @@
 import { changedSpans, DocumentModel, replacementText } from '@adecore/editor-core';
 import { MAX_REPLACEMENT_CHARACTERS } from './search-protocol.js';
+import { placeAt, postfixOperands, surroundShape, unwrapTargets } from './text-queries.js';
 import { GrammarPreparation } from './grammar-preparation.js';
 import { InputController } from './controller.js';
 import { resolveSmartKeys } from './smart-keys.js';
@@ -784,6 +785,19 @@ class SmartEditor {
     isReadOnly() {
         return this.settings.readOnly;
     }
+    placeAt(position) {
+        return placeAt(this.model, this, position, this.settings.language ?? 'plaintext');
+    }
+    postfixOperands(dot) {
+        return postfixOperands(this.model, this, dot, this.settings.language ?? 'plaintext');
+    }
+    surroundShape(range) {
+        return surroundShape(this.model, this, range, this.settings.language ?? 'plaintext');
+    }
+    unwrapTargets(position) {
+        const unit = this.settings.insertSpaces ? ' '.repeat(this.settings.tabSize) : '\t';
+        return unwrapTargets(this.model, this, position, this.settings.language ?? 'plaintext', unit);
+    }
     runCommand(command) {
         return this.controller.command(command);
     }

package/dist/fake.d.ts

@@ -1,4 +1,4 @@
-import type { Editor, EditorAttributionHover, EditorAttributionMark, EditorBlock, EditorCodeBlockOptions, EditorLineAction, EditorReplacement, EditorLineHighlight, LineToken, EditorChangeMark, EditorCodeVision, EditorClick, EditorClickHandler, EditorContextMenu, EditorContentChange, EditorEngine, EditorFindQuery, EditorFindState, EditorReplaceOptions, EditorGutterAction, EditorGutterMarker, EditorHighlight, EditorHover, EditorIndentation, EditorGhostText, EditorInlayClick, EditorInlayClickHandler, EditorInlayHint, EditorInlayTarget, EditorKeyHandler, EditorInputPopup, EditorMarker, EditorMessages, EditorOptions, EditorPosition, EditorRemoteCursor, EditorRange, EditorReveal, EditorRect, EditorRunCommand, EditorSelectionRanges, EditorFoldHints, EditorFoldOutline, EditorFolds, EditorSemanticToken, EditorSmartKeys, EditorApplyEditsOptions, EditorCopy, EditorPasteOptions, EditorTextChange, EditorTrackedRange, EditorTheme, EditorWhitespaceCleanup, EditorWidget } from './types.ts';
+import type { Editor, EditorAttributionHover, EditorAttributionMark, EditorBlock, EditorCodeBlockOptions, EditorLineAction, EditorReplacement, EditorLineHighlight, LineToken, EditorChangeMark, EditorCodeVision, EditorClick, EditorClickHandler, EditorContextMenu, EditorContentChange, EditorEngine, EditorFindQuery, EditorFindState, EditorReplaceOptions, EditorGutterAction, EditorGutterMarker, EditorHighlight, EditorHover, EditorIndentation, EditorGhostText, EditorInlayClick, EditorInlayClickHandler, EditorInlayHint, EditorInlayTarget, EditorKeyHandler, EditorInputPopup, EditorMarker, EditorMessages, EditorOptions, EditorPosition, EditorPostfixOperand, EditorSurroundShape, EditorTextPlace, EditorUnwrapTarget, EditorRemoteCursor, EditorRange, EditorReveal, EditorRect, EditorRunCommand, EditorSelectionRanges, EditorFoldHints, EditorFoldOutline, EditorFolds, EditorSemanticToken, EditorSmartKeys, EditorApplyEditsOptions, EditorCopy, EditorPasteOptions, EditorTextChange, EditorTrackedRange, EditorTheme, EditorWhitespaceCleanup, EditorWidget } from './types.ts';
 import { type Listener } from './listeners.ts';
 export declare class FakeEditor implements Editor {
     readonly element: HTMLElement;
@@ -257,6 +257,10 @@ export declare class FakeEditor implements Editor {
     zoomTo(size: number | null): void;
     setReadOnly(readOnly: boolean, reason?: string): void;
     isReadOnly(): boolean;
+    placeAt(position: EditorPosition): EditorTextPlace;
+    postfixOperands(dot: EditorPosition): readonly EditorPostfixOperand[];
+    surroundShape(range: EditorRange): EditorSurroundShape | null;
+    unwrapTargets(position: EditorPosition): readonly EditorUnwrapTarget[];
     readonly commands: EditorRunCommand[];
     runCommand(command: EditorRunCommand): boolean;
     focus(): void;

package/dist/fake.js

@@ -1,5 +1,6 @@
 import { emit, subscribe } from './listeners.js';
-import { changedSpan, changedSpans } from '@adecore/editor-core';
+import { changedSpan, changedSpans, DocumentModel } from '@adecore/editor-core';
+import { placeAt, postfixOperands, surroundShape, unwrapTargets } from './text-queries.js';
 import { mapTrackedRange } from './tracked-range.js';
 const LINE_BREAK = /\r\n|\r|\n/g;
 /* Where each line starts and where its text ends, before its line break: `\r\n`, a lone `\r` or `\n`, as the real document counts them. */
@@ -918,6 +919,19 @@ export class FakeEditor {
     isReadOnly() {
         return this.readOnly;
     }
+    placeAt(position) {
+        return placeAt(new DocumentModel(this.text), this, position, this.language ?? 'plaintext');
+    }
+    postfixOperands(dot) {
+        return postfixOperands(new DocumentModel(this.text), this, dot, this.language ?? 'plaintext');
+    }
+    surroundShape(range) {
+        return surroundShape(new DocumentModel(this.text), this, range, this.language ?? 'plaintext');
+    }
+    unwrapTargets(position) {
+        const unit = this.indentation.insertSpaces ? ' '.repeat(this.indentation.tabSize) : '\t';
+        return unwrapTargets(new DocumentModel(this.text), this, position, this.language ?? 'plaintext', unit);
+    }
     /* The commands run, in order; of its own the fake carries out only undo and redo. */
     commands = [];
     runCommand(command) {

package/dist/index.d.ts

@@ -3,8 +3,9 @@ export { AGENT_COLORS } from './attribution.ts';
 export { findDocComments, MAX_DOC_COMMENTS, type DocComment } from '@adecore/editor-core';
 export { DEFAULT_TODO_WORDS, findTodos, type TodoMatch, type TodoOptions } from '@adecore/editor-core';
 export { detectIndentation, type DetectedIndentation } from '@adecore/editor-core';
+export { commentSyntax, type CommentSyntax } from '@adecore/editor-core';
 export { createSmartEditorEngine } from './engine.ts';
 export { rememberCopy } from './controller.ts';
 export { DEFAULT_SMART_KEYS } from './smart-keys.ts';
 export { shikiScopeColors, shikiTokenizers } from './shiki.ts';
-export type { Editor, EditorAttributionHover, EditorAttributionMark, EditorMarkColor, EditorBlock, EditorChangeKind, EditorChangeMark, EditorCodeVision, EditorCodeVisionEntry, EditorClick, EditorCodeBlockOptions, EditorClickHandler, EditorCommand, EditorContextMenu, EditorEngine, EditorFindQuery, EditorFoldHints, EditorFoldRangeHint, EditorFoldOutline, EditorFoldRange, EditorFoldSymbol, EditorFolds, EditorFindState, EditorReplaceOptions, EditorGutterAction, EditorGutterIcon, EditorGutterMarker, EditorReplacement, EditorIndentation, EditorContentChange, EditorHighlight, EditorHighlightKind, EditorHover, EditorGhostText, EditorInlayClick, EditorInlayClickHandler, EditorInlayHint, EditorInlayTarget, EditorKeyHandler, EditorLineAction, EditorLineHighlight, EditorMarker, EditorInputPopup, EditorMessages, EditorMarkerSeverity, EditorReveal, EditorRect, EditorSmartKeys, EditorOptions, EditorPosition, EditorRemoteCursor, EditorRange, EditorApplyEditsOptions, EditorCopy, EditorPasteOptions, EditorTextChange, EditorTrackedRange, EditorRunCommand, EditorSelectionRanges, EditorTheme, EditorViewCommand, EditorWhitespaceCleanup, EditorWidget, EditorZoom, FoldRole, KeyChord, LineToken, LineTokenKind, ScopeColorSource, ScopeColors, ScopeStyle, EditorSemanticToken, LineTokenizer, SmartEditorEngineOptions, TokenizedLine, TokenizerSource } from './types.ts';
+export type { Editor, EditorAttributionHover, EditorAttributionMark, EditorMarkColor, EditorBlock, EditorChangeKind, EditorChangeMark, EditorCodeVision, EditorCodeVisionEntry, EditorClick, EditorCodeBlockOptions, EditorClickHandler, EditorCommand, EditorContextMenu, EditorEngine, EditorFindQuery, EditorFoldHints, EditorFoldRangeHint, EditorFoldOutline, EditorFoldRange, EditorFoldSymbol, EditorFolds, EditorFindState, EditorReplaceOptions, EditorGutterAction, EditorGutterIcon, EditorGutterMarker, EditorReplacement, EditorIndentation, EditorContentChange, EditorHighlight, EditorHighlightKind, EditorHover, EditorGhostText, EditorInlayClick, EditorInlayClickHandler, EditorInlayHint, EditorInlayTarget, EditorKeyHandler, EditorLineAction, EditorLineHighlight, EditorMarker, EditorInputPopup, EditorMessages, EditorMarkerSeverity, EditorReveal, EditorRect, EditorSmartKeys, EditorOptions, EditorPosition, EditorRemoteCursor, EditorRange, EditorApplyEditsOptions, EditorCopy, EditorPasteOptions, EditorPostfixOperand, EditorSurroundShape, EditorTextPlace, EditorUnwrapTarget, EditorTextChange, EditorTrackedRange, EditorRunCommand, EditorSelectionRanges, EditorTheme, EditorViewCommand, EditorWhitespaceCleanup, EditorWidget, EditorZoom, FoldRole, KeyChord, LineToken, LineTokenKind, ScopeColorSource, ScopeColors, ScopeStyle, EditorSemanticToken, LineTokenizer, SmartEditorEngineOptions, TokenizedLine, TokenizerSource } from './types.ts';

package/dist/index.js

@@ -3,6 +3,7 @@ export { AGENT_COLORS } from './attribution.js';
 export { findDocComments, MAX_DOC_COMMENTS } from '@adecore/editor-core';
 export { DEFAULT_TODO_WORDS, findTodos } from '@adecore/editor-core';
 export { detectIndentation } from '@adecore/editor-core';
+export { commentSyntax } from '@adecore/editor-core';
 export { createSmartEditorEngine } from './engine.js';
 export { rememberCopy } from './controller.js';
 export { DEFAULT_SMART_KEYS } from './smart-keys.js';

package/dist/keymap-table.d.ts

@@ -97,6 +97,11 @@ export declare const KEYMAP: {
     readonly renameSymbol: KeyBinding;
     readonly organizeImports: KeyBinding;
     readonly formatDocument: KeyBinding;
+    readonly insertLiveTemplate: KeyBinding;
+    readonly surroundWith: KeyBinding;
+    readonly surroundWithLiveTemplate: KeyBinding;
+    readonly unwrap: KeyBinding;
+    readonly saveAsLiveTemplate: KeyBinding;
     readonly wrapWithAbbreviation: KeyBinding;
     readonly selectionToChat: KeyBinding;
     readonly inlineEdit: KeyBinding;
@@ -123,7 +128,7 @@ export declare const KEYMAP: {
     readonly replace: KeyBinding;
 };
 export type KeymapId = keyof typeof KEYMAP;
-export type OptionalKeymapId = 'toggleRenderedDocs' | 'increaseFontSize' | 'decreaseFontSize' | 'resetFontSize' | 'sortLines' | 'reverseLines' | 'uniqueLines' | 'convertIndentsToSpaces' | 'convertIndentsToTabs' | 'completeCurrentStatement' | 'hippieCompletion' | 'hippieBackwardCompletion' | 'moveStatementUp' | 'moveStatementDown' | 'lastEditLocation' | 'nextEditLocation' | 'methodUp' | 'methodDown' | 'pasteFromHistory' | 'pasteAsPlainText' | 'nextChange' | 'previousChange' | 'codeBlockStart' | 'codeBlockEnd' | 'codeBlockStartWithSelection' | 'codeBlockEndWithSelection' | 'wrapWithAbbreviation' | 'typeHierarchy';
+export type OptionalKeymapId = 'toggleRenderedDocs' | 'increaseFontSize' | 'decreaseFontSize' | 'resetFontSize' | 'sortLines' | 'reverseLines' | 'uniqueLines' | 'convertIndentsToSpaces' | 'convertIndentsToTabs' | 'completeCurrentStatement' | 'hippieCompletion' | 'hippieBackwardCompletion' | 'moveStatementUp' | 'moveStatementDown' | 'lastEditLocation' | 'nextEditLocation' | 'methodUp' | 'methodDown' | 'pasteFromHistory' | 'pasteAsPlainText' | 'nextChange' | 'previousChange' | 'codeBlockStart' | 'codeBlockEnd' | 'codeBlockStartWithSelection' | 'codeBlockEndWithSelection' | 'wrapWithAbbreviation' | 'insertLiveTemplate' | 'surroundWith' | 'surroundWithLiveTemplate' | 'unwrap' | 'saveAsLiveTemplate' | 'typeHierarchy';
 export type Keymap = Readonly<Record<Exclude<KeymapId, OptionalKeymapId>, KeyBinding> & Partial<Record<OptionalKeymapId, KeyBinding>>>;
 export type KeymapOverrides = Partial<Record<KeymapId, Partial<KeyBinding>>>;
 export declare const KEYMAP_IDS: KeymapId[];

package/dist/keymap-table.js

@@ -100,7 +100,13 @@ export const KEYMAP = {
     renameSymbol: bind('Shift+F6'),
     organizeImports: bind('Ctrl+Alt+O'),
     formatDocument: bind('Mod+Alt+L'),
-    wrapWithAbbreviation: bind('Mod+Alt+J'),
+    insertLiveTemplate: bind('Mod+J'),
+    surroundWith: bind('Mod+Alt+T'),
+    surroundWithLiveTemplate: bind('Mod+Alt+J'),
+    unwrap: bind('Mod+Shift+Delete'),
+    saveAsLiveTemplate: bind(null),
+    // Surround with Emmet has no chord of its own: it is a row of Surround with Live Template, which has this one.
+    wrapWithAbbreviation: bind(null),
     selectionToChat: bind(null),
     inlineEdit: bind(null),
     suggestInline: bind(null),

package/dist/smart-keys.js

@@ -7,6 +7,7 @@ export const DEFAULT_SMART_KEYS = {
     indentOnPaste: true,
     smartSemicolon: true,
     smartArrow: true,
+    templateLiterals: true,
     camelHumps: false
 };
 /* The keys with what a host left out filled in from the defaults. */

package/dist/text-queries.d.ts

@@ -0,0 +1,10 @@
+import type { DocumentModel } from '@adecore/editor-core';
+import type { EditorPosition, EditorPostfixOperand, EditorRange, EditorSurroundShape, EditorTextPlace, EditorUnwrapTarget } from './types.ts';
+export interface Coordinates {
+    positionAt(offset: number): EditorPosition;
+    offsetAt(position: EditorPosition): number;
+}
+export declare function placeAt(model: DocumentModel, coordinates: Coordinates, position: EditorPosition, language: string): EditorTextPlace;
+export declare function postfixOperands(model: DocumentModel, coordinates: Coordinates, dot: EditorPosition, language: string): EditorPostfixOperand[];
+export declare function surroundShape(model: DocumentModel, coordinates: Coordinates, range: EditorRange, language: string): EditorSurroundShape | null;
+export declare function unwrapTargets(model: DocumentModel, coordinates: Coordinates, position: EditorPosition, language: string, indentUnit: string): EditorUnwrapTarget[];

package/dist/text-queries.js

@@ -0,0 +1,24 @@
+function rangeOf(coordinates, from, to) {
+    return { start: coordinates.positionAt(from), end: coordinates.positionAt(to) };
+}
+export function placeAt(model, coordinates, position, language) {
+    return model.placeAt(coordinates.offsetAt(position), language);
+}
+export function postfixOperands(model, coordinates, dot, language) {
+    const at = coordinates.offsetAt(dot);
+    return model.postfixOperands(at, language).map((operand) => ({
+        range: rangeOf(coordinates, operand.from, operand.from + model.slice(operand.from, at).trimEnd().length),
+        statement: operand.statement
+    }));
+}
+export function surroundShape(model, coordinates, range, language) {
+    const shape = model.surroundShape(coordinates.offsetAt(range.start), coordinates.offsetAt(range.end), language);
+    return shape === null ? null : { range: rangeOf(coordinates, shape.from, shape.to), statements: shape.statements, expression: shape.expression };
+}
+export function unwrapTargets(model, coordinates, position, language, indentUnit) {
+    return model.unwrapTargets(coordinates.offsetAt(position), language, indentUnit).map((target) => ({
+        kind: target.kind,
+        range: rangeOf(coordinates, target.range.from, target.range.to),
+        edits: target.edits.map((edit) => ({ range: rangeOf(coordinates, edit.from, edit.to), text: edit.text }))
+    }));
+}

package/dist/types.d.ts

@@ -1,6 +1,6 @@
 import type { EditorSearchClientOptions } from './search-client.ts';
 import type { Keymap } from './keymap-table.ts';
-import type { EditorCommand, FoldRole, WhitespaceCleanupOptions } from '@adecore/editor-core';
+import type { EditorCommand, FoldRole, TextPlaceKind, UnwrapKind, WhitespaceCleanupOptions } from '@adecore/editor-core';
 export type { EditorCommand, FoldRole };
 export type EditorWhitespaceCleanup = WhitespaceCleanupOptions;
 export type EditorFoldOutline = 'off' | 'hover' | 'always';
@@ -66,6 +66,7 @@ export interface EditorSmartKeys {
     readonly indentOnPaste: boolean;
     readonly smartSemicolon: boolean;
     readonly smartArrow: boolean;
+    readonly templateLiterals: boolean;
     readonly camelHumps: boolean;
 }
 export interface EditorFoldSymbol {
@@ -139,6 +140,24 @@ export interface EditorContentChange {
     readonly range: EditorRange;
     readonly text: string;
 }
+export interface EditorTextPlace {
+    readonly language: string;
+    readonly kind: TextPlaceKind;
+}
+export interface EditorPostfixOperand {
+    readonly range: EditorRange;
+    readonly statement: boolean;
+}
+export interface EditorSurroundShape {
+    readonly range: EditorRange;
+    readonly statements: boolean;
+    readonly expression: boolean;
+}
+export interface EditorUnwrapTarget {
+    readonly kind: UnwrapKind;
+    readonly range: EditorRange;
+    readonly edits: readonly EditorContentChange[];
+}
 export interface EditorCopy {
     readonly text: string;
     readonly wholeLines: boolean;
@@ -420,6 +439,10 @@ export interface Editor {
     onFontSizeChange?(listener: (size: number | null) => void): () => void;
     setReadOnly(readOnly: boolean, reason?: string): void;
     isReadOnly?(): boolean;
+    placeAt?(position: EditorPosition): EditorTextPlace;
+    postfixOperands?(dot: EditorPosition): readonly EditorPostfixOperand[];
+    surroundShape?(range: EditorRange): EditorSurroundShape | null;
+    unwrapTargets?(position: EditorPosition): readonly EditorUnwrapTarget[];
     runCommand(command: EditorRunCommand): boolean;
     focus(): void;
     dispose(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor",
-  "version": "0.43.0",
+  "version": "0.44.1",
   "type": "module",
   "exports": {
     ".": {
@@ -54,7 +54,7 @@
     "test": "bun test --conditions=source"
   },
   "dependencies": {
-    "@adecore/editor-core": "0.43.0",
+    "@adecore/editor-core": "0.44.1",
     "linkedom": "^0.18.14",
     "shiki": "^4.5.0"
   },

package/src/controller.ts

@@ -425,6 +425,7 @@ export class InputController {
             indentGuides: settings.guides,
             smartSemicolon: keys.smartSemicolon,
             smartArrow: keys.smartArrow,
+            templateLiterals: keys.templateLiterals,
             language: settings.language ?? 'plaintext',
             camelCase: keys.camelHumps,
             visualLine: (offset) => this.view.rowOf(offset),

package/src/engine.ts

@@ -1,5 +1,6 @@
 import { changedSpans, DocumentModel, type EditorSnapshot, type FoldHints, replacementText } from '@adecore/editor-core';
 import { MAX_REPLACEMENT_CHARACTERS } from './search-protocol.ts';
+import { placeAt, postfixOperands, surroundShape, unwrapTargets } from './text-queries.ts';
 import { GrammarPreparation } from './grammar-preparation.ts';
 import { InputController } from './controller.ts';
 import { resolveSmartKeys } from './smart-keys.ts';
@@ -43,6 +44,10 @@ import type {
     EditorMessages,
     EditorOptions,
     EditorPosition,
+    EditorPostfixOperand,
+    EditorSurroundShape,
+    EditorTextPlace,
+    EditorUnwrapTarget,
     EditorRemoteCursor,
     EditorRange,
     EditorReveal,
@@ -1067,6 +1072,24 @@ class SmartEditor implements Editor {
         return this.settings.readOnly;
     }
 
+    placeAt(position: EditorPosition): EditorTextPlace {
+        return placeAt(this.model, this, position, this.settings.language ?? 'plaintext');
+    }
+
+    postfixOperands(dot: EditorPosition): readonly EditorPostfixOperand[] {
+        return postfixOperands(this.model, this, dot, this.settings.language ?? 'plaintext');
+    }
+
+    surroundShape(range: EditorRange): EditorSurroundShape | null {
+        return surroundShape(this.model, this, range, this.settings.language ?? 'plaintext');
+    }
+
+    unwrapTargets(position: EditorPosition): readonly EditorUnwrapTarget[] {
+        const unit = this.settings.insertSpaces ? ' '.repeat(this.settings.tabSize) : '\t';
+
+        return unwrapTargets(this.model, this, position, this.settings.language ?? 'plaintext', unit);
+    }
+
     runCommand(command: EditorRunCommand): boolean {
         return this.controller.command(command);
     }

package/src/fake.ts

@@ -34,6 +34,10 @@ import type {
     EditorMessages,
     EditorOptions,
     EditorPosition,
+    EditorPostfixOperand,
+    EditorSurroundShape,
+    EditorTextPlace,
+    EditorUnwrapTarget,
     EditorRemoteCursor,
     EditorRange,
     EditorReveal,
@@ -55,7 +59,8 @@ import type {
     EditorWidget
 } from './types.ts';
 import { emit, type Listener, subscribe } from './listeners.ts';
-import { changedSpan, changedSpans } from '@adecore/editor-core';
+import { changedSpan, changedSpans, DocumentModel } from '@adecore/editor-core';
+import { placeAt, postfixOperands, surroundShape, unwrapTargets } from './text-queries.ts';
 import { mapTrackedRange } from './tracked-range.ts';
 
 interface OffsetSelection {
@@ -1270,6 +1275,24 @@ export class FakeEditor implements Editor {
         return this.readOnly;
     }
 
+    placeAt(position: EditorPosition): EditorTextPlace {
+        return placeAt(new DocumentModel(this.text), this, position, this.language ?? 'plaintext');
+    }
+
+    postfixOperands(dot: EditorPosition): readonly EditorPostfixOperand[] {
+        return postfixOperands(new DocumentModel(this.text), this, dot, this.language ?? 'plaintext');
+    }
+
+    surroundShape(range: EditorRange): EditorSurroundShape | null {
+        return surroundShape(new DocumentModel(this.text), this, range, this.language ?? 'plaintext');
+    }
+
+    unwrapTargets(position: EditorPosition): readonly EditorUnwrapTarget[] {
+        const unit = this.indentation.insertSpaces ? ' '.repeat(this.indentation.tabSize) : '\t';
+
+        return unwrapTargets(new DocumentModel(this.text), this, position, this.language ?? 'plaintext', unit);
+    }
+
     /* The commands run, in order; of its own the fake carries out only undo and redo. */
     readonly commands: EditorRunCommand[] = [];
 

package/src/index.ts

@@ -3,6 +3,7 @@ export { AGENT_COLORS } from './attribution.ts';
 export { findDocComments, MAX_DOC_COMMENTS, type DocComment } from '@adecore/editor-core';
 export { DEFAULT_TODO_WORDS, findTodos, type TodoMatch, type TodoOptions } from '@adecore/editor-core';
 export { detectIndentation, type DetectedIndentation } from '@adecore/editor-core';
+export { commentSyntax, type CommentSyntax } from '@adecore/editor-core';
 export { createSmartEditorEngine } from './engine.ts';
 export { rememberCopy } from './controller.ts';
 export { DEFAULT_SMART_KEYS } from './smart-keys.ts';
@@ -64,6 +65,10 @@ export type {
     EditorApplyEditsOptions,
     EditorCopy,
     EditorPasteOptions,
+    EditorPostfixOperand,
+    EditorSurroundShape,
+    EditorTextPlace,
+    EditorUnwrapTarget,
     EditorTextChange,
     EditorTrackedRange,
     EditorRunCommand,

package/src/keymap-table.ts

@@ -123,7 +123,13 @@ export const KEYMAP = {
     renameSymbol: bind('Shift+F6'),
     organizeImports: bind('Ctrl+Alt+O'),
     formatDocument: bind('Mod+Alt+L'),
-    wrapWithAbbreviation: bind('Mod+Alt+J'),
+    insertLiveTemplate: bind('Mod+J'),
+    surroundWith: bind('Mod+Alt+T'),
+    surroundWithLiveTemplate: bind('Mod+Alt+J'),
+    unwrap: bind('Mod+Shift+Delete'),
+    saveAsLiveTemplate: bind(null),
+    // Surround with Emmet has no chord of its own: it is a row of Surround with Live Template, which has this one.
+    wrapWithAbbreviation: bind(null),
     selectionToChat: bind(null),
     inlineEdit: bind(null),
     suggestInline: bind(null),
@@ -182,6 +188,11 @@ export type OptionalKeymapId =
     | 'codeBlockStartWithSelection'
     | 'codeBlockEndWithSelection'
     | 'wrapWithAbbreviation'
+    | 'insertLiveTemplate'
+    | 'surroundWith'
+    | 'surroundWithLiveTemplate'
+    | 'unwrap'
+    | 'saveAsLiveTemplate'
     | 'typeHierarchy';
 
 export type Keymap = Readonly<Record<Exclude<KeymapId, OptionalKeymapId>, KeyBinding> & Partial<Record<OptionalKeymapId, KeyBinding>>>;

package/src/smart-keys.ts

@@ -9,6 +9,7 @@ export const DEFAULT_SMART_KEYS: EditorSmartKeys = {
     indentOnPaste: true,
     smartSemicolon: true,
     smartArrow: true,
+    templateLiterals: true,
     camelHumps: false
 };
 

package/src/text-queries.ts

@@ -0,0 +1,45 @@
+import type { DocumentModel } from '@adecore/editor-core';
+import type { EditorPosition, EditorPostfixOperand, EditorRange, EditorSurroundShape, EditorTextPlace, EditorUnwrapTarget } from './types.ts';
+
+/* How an editor turns the offsets of the text model into positions and back. */
+export interface Coordinates {
+    positionAt(offset: number): EditorPosition;
+    offsetAt(position: EditorPosition): number;
+}
+
+function rangeOf(coordinates: Coordinates, from: number, to: number): EditorRange {
+    return { start: coordinates.positionAt(from), end: coordinates.positionAt(to) };
+}
+
+export function placeAt(model: DocumentModel, coordinates: Coordinates, position: EditorPosition, language: string): EditorTextPlace {
+    return model.placeAt(coordinates.offsetAt(position), language);
+}
+
+export function postfixOperands(model: DocumentModel, coordinates: Coordinates, dot: EditorPosition, language: string): EditorPostfixOperand[] {
+    const at = coordinates.offsetAt(dot);
+
+    return model.postfixOperands(at, language).map((operand) => ({
+        range: rangeOf(coordinates, operand.from, operand.from + model.slice(operand.from, at).trimEnd().length),
+        statement: operand.statement
+    }));
+}
+
+export function surroundShape(model: DocumentModel, coordinates: Coordinates, range: EditorRange, language: string): EditorSurroundShape | null {
+    const shape = model.surroundShape(coordinates.offsetAt(range.start), coordinates.offsetAt(range.end), language);
+
+    return shape === null ? null : { range: rangeOf(coordinates, shape.from, shape.to), statements: shape.statements, expression: shape.expression };
+}
+
+export function unwrapTargets(
+    model: DocumentModel,
+    coordinates: Coordinates,
+    position: EditorPosition,
+    language: string,
+    indentUnit: string
+): EditorUnwrapTarget[] {
+    return model.unwrapTargets(coordinates.offsetAt(position), language, indentUnit).map((target) => ({
+        kind: target.kind,
+        range: rangeOf(coordinates, target.range.from, target.range.to),
+        edits: target.edits.map((edit) => ({ range: rangeOf(coordinates, edit.from, edit.to), text: edit.text }))
+    }));
+}

package/src/types.ts

@@ -1,6 +1,6 @@
 import type { EditorSearchClientOptions } from './search-client.ts';
 import type { Keymap } from './keymap-table.ts';
-import type { EditorCommand, FoldRole, WhitespaceCleanupOptions } from '@adecore/editor-core';
+import type { EditorCommand, FoldRole, TextPlaceKind, UnwrapKind, WhitespaceCleanupOptions } from '@adecore/editor-core';
 
 export type { EditorCommand, FoldRole };
 
@@ -150,6 +150,8 @@ export interface EditorSmartKeys {
     readonly smartSemicolon: boolean;
     /* In PHP a `-` typed after a variable, a member or a `)` or `]` becomes `->`. */
     readonly smartArrow: boolean;
+    /* In JavaScript and TypeScript a `${` typed in a quoted string makes it a template literal. */
+    readonly templateLiterals: boolean;
     /* Moving by word also stops inside `camelCase` and `snake_case` words. Off. */
     readonly camelHumps: boolean;
 }
@@ -288,6 +290,37 @@ export interface EditorContentChange {
     readonly text: string;
 }
 
+/* What the text at a position is written in, with embedded regions resolved, and whether it is code, a comment or a string. */
+export interface EditorTextPlace {
+    readonly language: string;
+    readonly kind: TextPlaceKind;
+}
+
+/* An expression that ends right before a dot. */
+export interface EditorPostfixOperand {
+    /* The expression, without the whitespace before the dot. */
+    readonly range: EditorRange;
+    /* Whether it starts a statement; only the widest operand can. */
+    readonly statement: boolean;
+}
+
+/* What a range can be surrounded with: whole statements, one expression, both or neither. */
+export interface EditorSurroundShape {
+    /* The range after trimming whitespace, widened past a trailing line comment for statements. */
+    readonly range: EditorRange;
+    readonly statements: boolean;
+    readonly expression: boolean;
+}
+
+/* A construct around a position that can be unwrapped or removed. */
+export interface EditorUnwrapTarget {
+    readonly kind: UnwrapKind;
+    /* The whole construct, for a preview. */
+    readonly range: EditorRange;
+    /* Small edits in the coordinates of the text before them, which `applyEdits` takes as they are. */
+    readonly edits: readonly EditorContentChange[];
+}
+
 /* What a copy or cut put on the clipboard. */
 export interface EditorCopy {
     readonly text: string;
@@ -843,6 +876,14 @@ export interface Editor {
     setReadOnly(readOnly: boolean, reason?: string): void;
     /* Whether the editor refuses edits. Optional so an editor from before it still fits. */
     isReadOnly?(): boolean;
+    /* What the text at a position is written in and whether it is code, a comment or a string. Optional so an editor from before it still fits. */
+    placeAt?(position: EditorPosition): EditorTextPlace;
+    /* Every expression that ends right before the `.` at `dot`, innermost first. Optional so an editor from before it still fits. */
+    postfixOperands?(dot: EditorPosition): readonly EditorPostfixOperand[];
+    /* What a range can be surrounded with; null for a blank range. Optional so an editor from before it still fits. */
+    surroundShape?(range: EditorRange): EditorSurroundShape | null;
+    /* What can be unwrapped or removed around a position, innermost first. Optional so an editor from before it still fits. */
+    unwrapTargets?(position: EditorPosition): readonly EditorUnwrapTarget[];
     /* Runs an editing command on every caret, as its key would. False when it changed nothing. */
     runCommand(command: EditorRunCommand): boolean;
     focus(): void;