Skip to content

fixed(RunButton): Fixed the BUG in CodeBlockContext where srcCode was overwritten after multiple executions #424

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
shunlibest wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed(RunButton): Fixed the BUG in CodeBlockContext where srcCode was overwritten after multiple executions #424

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
14 changes: 8 additions & 6 deletions src/RunButton.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export const codeBlockHasButtonClass: string = "has-run-code-button";

interface CodeBlockContext {
srcCode: string;
button: HTMLButtonElement;
injectedCode: string,
button: HTMLButtonElement;
language: LanguageId;
markdownFile: string;
outputter: Outputter;
Expand All @@ -37,7 +38,7 @@ async function handleExecution(block: CodeBlockContext) {
const s: ExecutorSettings = block.outputter.settings;

button.className = disabledClass;
block.srcCode = await new CodeInjector(app, s, language).injectCode(srcCode);
block.injectedCode = await new CodeInjector(app, s, language).injectCode(srcCode);

switch (language) {
case "js": return runCode(s.nodePath, s.nodeArgs, s.jsFileExtension, block, { transform: (code) => macro.expandJS(code) });
Expand Down Expand Up @@ -77,7 +78,7 @@ async function handleExecution(block: CodeBlockContext) {
case "ocaml": return runCode(s.ocamlPath, s.ocamlArgs, "ocaml", block, { shell: true });
case "php": return runCode(s.phpPath, s.phpArgs, s.phpFileExtension, block, { shell: true });
case "latex":
const outputPath: string = await retrieveFigurePath(block.srcCode, s.latexFigureTitlePattern, block.markdownFile, s);
const outputPath: string = await retrieveFigurePath(block.injectedCode, s.latexFigureTitlePattern, block.markdownFile, s);
const invokeCompiler: string = [s.latexTexfotArgs, s.latexCompilerPath, s.latexCompilerArgs].join(" ");
return (!s.latexDoFilter)
? runCode(s.latexCompilerPath, s.latexCompilerArgs, outputPath, block, { transform: (code) => modifyLatexCode(code, s) })
Expand Down Expand Up @@ -151,7 +152,8 @@ function addToCodeBlock(codeBlock: HTMLElement, file: string, view: MarkdownView
pre.appendChild(button);

const block: CodeBlockContext = {
srcCode: srcCode,
srcCode: srcCode,
injectedCode: "",
language: canonicalLanguage,
markdownFile: file,
button: button,
Expand Down Expand Up @@ -195,11 +197,11 @@ function createButton(): HTMLButtonElement {
*/
function runCode(cmd: string, cmdArgs: string, ext: string, block: CodeBlockContext, options?: { shell?: boolean; transform?: (code: string) => string; }) {
const useShell: boolean = (options?.shell) ? options.shell : false;
if (options?.transform) block.srcCode = options.transform(block.srcCode);
if (options?.transform) block.injectedCode = options.transform(block.injectedCode);
if (!useShell) block.outputter.startBlock();

const executor = block.executors.getExecutorFor(block.markdownFile, block.language, useShell);
executor.run(block.srcCode, block.outputter, cmd, cmdArgs, ext).then(() => {
executor.run(block.injectedCode, block.outputter, cmd, cmdArgs, ext).then(() => {
block.button.className = buttonClass;
if (!useShell) {
block.outputter.closeInput();
Expand Down