From d7b4936ddb12eaf55bea49291152487c7c9ba0e0 Mon Sep 17 00:00:00 2001
From: "Adrien Minne (adrm)" <adrm@odoo.com>
Date: Mon, 6 Nov 2023 11:26:39 +0100
Subject: [PATCH] [IMP] evaluation: improve perfs of
 `getCorrespondingFormulaCell`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 odoo/o-spreadsheet#3143

Task: 3584306
X-original-commit: 3d6f4f95451c7505fce006656c4f9380bcc82136
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
---
 src/formulas/compiler.ts                           |  4 ++++
 src/index.ts                                       | 10 ++++++++--
 .../cell_evaluation/evaluation_plugin.ts           | 14 +++++++-------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/formulas/compiler.ts b/src/formulas/compiler.ts
index 99f77186ca..359d51761e 100644
--- 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
index 4548bf5125..e37b8322b9 100644
--- 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
index a2c8c2a049..ceac1d55bc 100644
--- 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;