Fix: for variable declaration in formatted code

Canna71 · Dec 17, 2022 · 7e9eae8 · 7e9eae8
1 parent 2763e6d
commit 7e9eae8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/Extensions/PostProcessor.ts b/src/Extensions/PostProcessor.ts
@@ -11,10 +11,9 @@ import parse from 'src/Math/Parsing';
 export const getPostPrcessor = (settings: MathpadSettings):MarkdownPostProcessor => {
     return debounce((element: HTMLElement, context: MarkdownPostProcessorContext) => {
         // todo: debounce and then use context.containerEl
-        const codes = (context as any).containerEl.querySelectorAll("code, div[data-mathpad-input]"); 
+        const codes = (context as any).containerEl.querySelectorAll("code, div[data-mathpad-input], mjx-container[data-mathpad-input]"); 
         const engine = createEngine();
-
-        // const settings = getSettings();
+        // console.log(codes);
         for (let index = 0; index < codes.length; index++) {
             const code = codes.item(index) as HTMLElement;
             processCode(code, engine, context, settings);
@@ -30,8 +29,10 @@ function processCode(code: HTMLElement, engine: Engine, context: MarkdownPostPro
     } else {
         text = code.dataset.mathpadInput;
     }
-
+
+    // console.log("processCode " + text)
     const pr = parse(text, settings);
+
     if(pr.isValid){
         const containerWidth = Math.clamp((context as any).containerEl.offsetWidth,200,700);
         const plotWidth = settings.plotWidth>0?settings.plotWidth:containerWidth;

diff --git a/src/Extensions/ResultField.ts b/src/Extensions/ResultField.ts
@@ -32,7 +32,7 @@ export const resultField = StateField.define<DecorationSet>({
 
         const nodeA = tree.resolve(caretPos, 1);
         const nodeB = tree.resolve(caretPos, -1);
-        console.log(nodeA.name, nodeB.name);
+        // console.log(nodeA.name, nodeB.name);
         // formatting_formatting-code_inline-code_list-1
         // inline-code_list-1
         // we try to avoid recomputing if editing outside inline-code

diff --git a/src/Extensions/ResultMarkdownChild.ts b/src/Extensions/ResultMarkdownChild.ts
@@ -47,7 +47,8 @@ export class MathResult extends MarkdownRenderChild {
         const mathEl = renderMath(latex || this.padScope.noteLatex, this.block);
 
         finishRenderMath();
-        mathEl.dataset.mathpadInput = this.padScope.input + "=?";
+        mathEl.dataset.mathpadInput = this.padScope.input + 
+            ((this.padScope.parseResult.isVarDec || this.padScope.parseResult.isFnDec) ? "" : "=?");
         return mathEl;
     }
 }
diff --git a/src/Math/PadScope.ts b/src/Math/PadScope.ts
@@ -141,6 +141,7 @@ export default class PadScope {
 
     process(engine: Engine, parseResult: ParseResult): PadScope {
         try {
+            // console.log("processing:", parseResult)
             // save processing options and scope
             this._input = parseResult.text;
             this._scope = engine.getScope();