[IMP] evaluation: improve perfs of getCorrespondingFormulaCell

The getter `getCorrespondingFormulaCell` was tokenizing the cell's content (via `compile`), which took a bit of time. But this is useless, as we already have the tokens in the formula cell. closes #3134 Task: 3584306 Signed-off-by: Lucas Lefèvre (lul) <[email protected]>
odoo · Nov 13, 2023 · 3d6f4f9 · 3d6f4f9
1 parent 17ba122
commit 3d6f4f9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/src/formulas/compiler.ts b/src/formulas/compiler.ts
@@ -53,6 +53,10 @@ export const functionCache: { [key: string]: Omit<CompiledFormula, "dependencies
 
 export function compile(formula: string): CompiledFormula {
   const tokens = rangeTokenize(formula);
+  return compileTokens(tokens);
+}
+
+export function compileTokens(tokens: Token[]): CompiledFormula {
   const { dependencies, constantValues } = formulaArguments(tokens);
   const cacheKey = compilationCacheKey(tokens, dependencies, constantValues);
   if (!functionCache[cacheKey]) {

diff --git a/src/index.ts b/src/index.ts
@@ -111,8 +111,14 @@ export const __info__ = {};
 export { Revision } from "./collaborative/revisions";
 export { Spreadsheet } from "./components/index";
 export { setDefaultSheetViewSize } from "./constants";
-export { compile, functionCache } from "./formulas/compiler";
-export { astToFormula, convertAstNodes, iterateAstNodes, parse } from "./formulas/parser";
+export { compile, compileTokens, functionCache } from "./formulas/compiler";
+export {
+  astToFormula,
+  convertAstNodes,
+  iterateAstNodes,
+  parse,
+  parseTokens,
+} from "./formulas/parser";
 export { tokenize } from "./formulas/tokenizer";
 export { AbstractChart } from "./helpers/figures/charts";
 export { findCellInNewZone } from "./helpers/zones";

diff --git a/src/plugins/ui_core_views/cell_evaluation/evaluation_plugin.ts b/src/plugins/ui_core_views/cell_evaluation/evaluation_plugin.ts
@@ -1,4 +1,5 @@
-import { compile, isExportableToExcel } from "../../../formulas/index";
+import { compileTokens } from "../../../formulas/compiler";
+import { Token, compile, isExportableToExcel } from "../../../formulas/index";
 import { getItemId, positions, toXC } from "../../../helpers/index";
 import {
   CellPosition,
@@ -322,10 +323,9 @@ export class EvaluationPlugin extends UIPlugin {
   getCorrespondingFormulaCell(position: CellPosition): FormulaCell | undefined {
     const cell = this.getters.getCell(position);
 
-    if (cell && cell.content) {
-      if (cell.isFormula && !isBadExpression(cell.content)) {
-        return cell;
-      }
+    if (cell && cell.isFormula) {
+      return isBadExpression(cell.compiledFormula.tokens) ? undefined : cell;
+    } else if (cell && cell.content) {
       return undefined;
     }
 
@@ -350,9 +350,9 @@ export class EvaluationPlugin extends UIPlugin {
   }
 }
 
-function isBadExpression(formula: string): boolean {
+function isBadExpression(tokens: Token[]): boolean {
   try {
-    compile(formula);
+    compileTokens(tokens);
     return false;
   } catch (error) {
     return true;