Code chunks not being split correctly

[kylebutts]

I am facing bugs with how the extension marks R code chunks. This code does not get split correctly into three chunks:

# %% Chunk 1
print("Chunk 1")

# %% Chunk 2
print("Chunk 2")

# %% Chunk 3
print("Chunk 3")

Instead, the # %% Chunk 2 gets included in chunk 1:

When running "R: Select Current Chunk", we confirm the chunk is being mislabeled

Environment:

VSCode version: Version: 1.84.2 (Universal)

R version 4.3.0 (2023-04-21) -- "Already Tomorrow"
Platform: aarch64-apple-darwin20 (64-bit)

[kylebutts]

I think the issue is with isChunkEndLine. This selects the next chunk header # %% as the ending of the previous code chunk.

vscode-R/src/rmarkdown/index.ts

Lines 26 to 33 in 63ee735

	function isChunkEndLine(text: string, isRDoc: boolean) {
	if (isRDoc) {
	return (isRChunkLine(text));
	} else {
	return (!!text.match(/^\s*```+\s*$/g));
	}
	}

I think the solution is to (1) change line 207 to use vscode.Position(line - 1, lines[line - 1].length) when isRDoc is true and (2) update chunkStartLine to the current line.

vscode-R/src/rmarkdown/index.ts

Lines 179 to 231 in 63ee735

	export function getChunks(document: vscode.TextDocument): RMarkdownChunk[] {
	const lines = document.getText().split(/\r?\n/);
	const chunks: RMarkdownChunk[] = [];
	let line = 0;
	let chunkId = 0; // One-based index
	let chunkStartLine: number | undefined = undefined;
	let chunkEndLine: number | undefined = undefined;
	let chunkLanguage: string | undefined = undefined;
	let chunkOptions: string | undefined = undefined;
	let chunkEval: boolean | undefined = undefined;
	const isRDoc = isRDocument(document);
	while (line < lines.length) {
	if (chunkStartLine === undefined) {
	if (isChunkStartLine(lines[line], isRDoc)) {
	chunkId++;
	chunkStartLine = line;
	chunkLanguage = getChunkLanguage(lines[line]);
	chunkOptions = getChunkOptions(lines[line]);
	chunkEval = getChunkEval(chunkOptions);
	}
	} else {
	if (isChunkEndLine(lines[line], isRDoc)) {
	chunkEndLine = line;
	const chunkRange = new vscode.Range(
	new vscode.Position(chunkStartLine, 0),
	new vscode.Position(line, lines[line].length)
	);
	const codeRange = new vscode.Range(
	new vscode.Position(chunkStartLine + 1, 0),
	new vscode.Position(line - 1, lines[line - 1].length)
	);
	chunks.push({
	id: chunkId, // One-based index
	startLine: chunkStartLine,
	endLine: chunkEndLine,
	language: chunkLanguage,
	options: chunkOptions,
	eval: chunkEval,
	chunkRange: chunkRange,
	codeRange: codeRange
	});
	chunkStartLine = undefined;
	}
	}
	line++;
	}
	return chunks;
	}

[kylebutts]

There is a second bug where the final code chunk will never be recognized since isChunkEndLine never is true, e.g.

# %% Chunk 1
print("Chunk 1")

shows up as one single code chunk.