Skip to content

Fix typescript errors due to mismatched range type #1010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seeM wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −34
Open

Fix typescript errors due to mismatched range type #1010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 36 additions & 34 deletions apps/vscode/src/providers/cell/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
*
*/

import { lines, sleep } from "core";
import { CodeViewActiveBlockContext, CodeViewSelectionAction } from "editor-types";
import { lines } from "core";
import { Range as LSRange } from 'vscode-languageserver-types';
import { CodeViewActiveBlockContext } from "editor-types";
import {
Position,
Range,
Expand Down Expand Up @@ -56,7 +57,6 @@ import { commands } from "vscode";
import { virtualDocForCode, withVirtualDocUri } from "../../vdoc/vdoc";
import { embeddedLanguage } from "../../vdoc/languages";
import { Uri } from "vscode";
import { StatementRange } from "positron";

const isPositron = tryAcquirePositronApi();

Expand Down Expand Up @@ -177,7 +177,7 @@ class RunCurrentCellCommand extends RunCommand implements Command {
const executor = await this.cellExecutorForLanguage(language, editor.document, this.engine_);
if (executor) {
const code = codeWithoutOptionsFromBlock(block);
const ranges = block.range ? [block.range] : undefined;
const ranges = [toVscodeRange(block.range)];
const metadata = cellMetadataForBlock(block);
await executeInteractive(executor, [code], editor.document, ranges, metadata ? [metadata] : undefined);
}
Expand Down Expand Up @@ -357,31 +357,29 @@ class RunCurrentCommand extends RunCommand implements Command {
if (activeBlock && selection.length <= 0) {
const codeLines = lines(activeBlock.code);
const vdoc = virtualDocForCode(codeLines, embeddedLanguage(activeBlock.language)!);
if (vdoc) {
const parentUri = Uri.file(editor.document.fileName);
const injectedLines = (vdoc.language?.inject?.length ?? 0);
const parentUri = Uri.file(editor.document.fileName);
const injectedLines = (vdoc.language?.inject?.length ?? 0);

const positionIntoVdoc = (p: LineAndCharPos) =>
new Position(p.line + injectedLines, p.character);
const positionOutOfVdoc = (p: LineAndCharPos) =>
new Position(p.line - injectedLines, p.character);
const positionIntoVdoc = (p: LineAndCharPos) =>
new Position(p.line + injectedLines, p.character);
const positionOutOfVdoc = (p: LineAndCharPos) =>
new Position(p.line - injectedLines, p.character);

const executor = await this.cellExecutorForLanguage(context.activeLanguage, editor.document, this.engine_);
if (executor) {
const nextStatementPos = await withVirtualDocUri(
vdoc,
parentUri,
"executeSelectionAtPositionInteractive",
(uri) => executeAtPositionInteractive(
executor,
uri,
positionIntoVdoc(context.selection.start)
)
);
const executor = await this.cellExecutorForLanguage(context.activeLanguage, editor.document, this.engine_);
if (executor) {
const nextStatementPos = await withVirtualDocUri(
vdoc,
parentUri,
"executeSelectionAtPositionInteractive",
(uri) => executeAtPositionInteractive(
executor,
uri,
positionIntoVdoc(context.selection.start)
)
);

if (nextStatementPos !== undefined) {
await editor.setBlockSelection(context, positionOutOfVdoc(nextStatementPos));
}
if (nextStatementPos !== undefined) {
await editor.setBlockSelection(context, positionOutOfVdoc(nextStatementPos));
}
}
}
Expand Down Expand Up @@ -512,9 +510,7 @@ class RunCellsAboveCommand extends RunCommand implements Command {
) as Array<TokenMath | TokenCodeBlock>) {
code.push(codeWithoutOptionsFromBlock(blk));
metadata.push(cellMetadataForBlock(blk));
if (blk.range) {
ranges.push(blk.range);
}
ranges.push(toVscodeRange(blk.range));
}

// execute (only pass ranges if we collected the same number as code blocks)
Expand Down Expand Up @@ -583,7 +579,7 @@ class RunCellsBelowCommand extends RunCommand implements Command {
// include blocks of this language
if (blockLanguage === language) {
blocks.push(codeWithoutOptionsFromBlock(blk));
ranges.push(blk.range);
ranges.push(toVscodeRange(blk.range));
metadata.push(cellMetadataForBlock(blk));
}
}
Expand Down Expand Up @@ -650,9 +646,7 @@ class RunAllCellsCommand extends RunCommand implements Command {
if (blockLanguage === language) {
blocks.push(codeWithoutOptionsFromBlock(blk));
metadata.push(cellMetadataForBlock(blk));
if (blk.range) {
ranges.push(blk.range);
}
ranges.push(toVscodeRange(blk.range));
}
}
if (language && blocks.length > 0) {
Expand Down Expand Up @@ -754,7 +748,7 @@ async function runAdjacentBlock(host: ExtensionHost, editor: TextEditor, engine:
const language = languageNameFromBlock(block);
const executor = await host.cellExecutorForLanguage(language, editor.document, engine);
if (executor) {
const ranges = block.range ? [block.range] : undefined;
const ranges = [toVscodeRange(block.range)];
const metadata = cellMetadataForBlock(block);
await executeInteractive(executor, [codeWithoutOptionsFromBlock(block)], editor.document, ranges, metadata ? [metadata] : undefined);
}
Expand Down Expand Up @@ -817,3 +811,11 @@ async function activateIfRequired(editor: QuartoVisualEditor) {
await editor.activate();
}
}

/** Convert a plain LSP-style range to a VS Code Range instance. */
function toVscodeRange(range: LSRange): Range {
return new Range(
new Position(range.start.line, range.start.character),
new Position(range.end.line, range.end.character)
);
}
Loading