ASTDiff GUI: Further improvement for #672

Speed up the folding process
tsantalis · Aug 19, 2024 · b40cb7c · b40cb7c
1 parent ac735a4
commit b40cb7c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/gui/webdiff/viewers/monaco/MonacoCore.java b/src/main/java/gui/webdiff/viewers/monaco/MonacoCore.java
@@ -252,9 +252,9 @@ public String getDiffName() {
 
     public String makeDiffConfig() {
         boolean spv = !showFilenames;
-        int spvInt = spv ? 1 : 0;
         return "{ "
                 + "moved: " + this.isMoved
+                + ", id: " + id
                 + ", spv: " + spv
                 + ", file: \"" + srcFileName + "\""
                 + ", left: " + this.getLeftJsConfig()

diff --git a/src/main/resources/web/dist/monaco.js b/src/main/resources/web/dist/monaco.js
@@ -110,6 +110,8 @@ function monaco(config) {
             rightEditor.deltaDecorations([], rightDecorations);
             rightEditor.getModel().moved = config.moved;
             leftEditor.getModel().moved = config.moved;
+            rightEditor.getModel().id = config.id
+            leftEditor.getModel().id = config.id
             rightEditor.onMouseDown((event) => {
                 if (event.target.range) {
                     const allDecorations = rightEditor.getModel().getDecorationsInRange(event.target.range, rightEditor.id, true)
@@ -229,6 +231,7 @@ function createFoldingRanges(linesToFold) {
 function setAllFoldings(config, leftEditor, rightEditor) {
     const foldingRangeProvider = {
         provideFoldingRanges: (model, context, token) => {
+            if (model.id !== config.id) return;
             let rangesToFold = createFoldingRanges(getLinesToFold(config, model, 2));
             return rangesToFold.map(range => ({
                 start: range.startLineNumber,