toggle formatting in diff view (#229)

Author: marcellourbani

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [1.7.16] 2024-10-29
+
+### Added
+
+- toggle normalization in diff
+
 ## [1.7.15] 2024-10-27
 
 ### Added

client/src/commands/registry.ts

@@ -45,6 +45,7 @@ export const AbapFsCommands = {
   openrevstate: "abapfs.openrevstate",
   opendiff: "abapfs.opendiff",
   opendiffNormalized: "abapfs.opendiffNormalized",
+  togglediffNormalize: "abapfs.togglediffNormalize",
   changequickdiff: "abapfs.changequickdiff",
   remotediff: "abapfs.remotediff",
   comparediff: "abapfs.comparediff",

client/src/scm/abaprevisions/commands.ts

@@ -1,5 +1,5 @@
 import { command, AbapFsCommands } from "../../commands"
-import { Uri, QuickPickItem, window, commands, workspace, ProgressLocation } from "vscode"
+import { Uri, QuickPickItem, window, commands, workspace, ProgressLocation, TabInputTextDiff } from "vscode"
 import { abapUri, uriRoot, getOrCreateRoot, getClient, ADTSCHEME, rootIsConnected } from "../../adt/conections"
 import { AbapRevisionService, revLabel } from "./abaprevisionservice"
 import { ADTClient, Revision } from "abap-adt-api"
@@ -8,7 +8,7 @@ import { revisionUri } from "./documentprovider"
 import { RemoteManager, formatKey } from "../../config"
 import { isAbapFile } from "abapfs"
 import { AGroup, AState } from "./abapscm"
-import { caughtToString } from "../../lib"
+import { caughtToString, atob, btoa } from "../../lib"
 import * as t from "io-ts"
 import { isRight } from "fp-ts/lib/Either"
 import { vsCodeUri } from "../../langClient"
@@ -291,6 +291,24 @@ export class AbapRevisionCommands {
     )
   }
 
+  @command(AbapFsCommands.togglediffNormalize)
+  private static toggleDiffNormalize() {
+    try {
+      const tab = window.tabGroups.activeTabGroup.activeTab
+      const toggleNorm = (u: Uri) => {
+        const o = u.fragment ? JSON.parse(atob(u.fragment)) : {}
+        o.normalized = !o.normalized
+        return u.with({ fragment: btoa(JSON.stringify(o)) })
+      }
+      if (tab?.input instanceof TabInputTextDiff) {
+        const { original, modified } = tab.input
+        return commands.executeCommand<void>("vscode.diff", toggleNorm(original), toggleNorm(modified), tab.label)
+      } else window.showInformationMessage("Unable to normalize this comparison")
+    } catch (error) {
+      window.showErrorMessage(caughtToString(error))
+    }
+  }
+
   @command(AbapFsCommands.openrevstate)
   private static async openState(state: AState) {
     const document = await workspace.openTextDocument(state.resourceUri)

package.json

@@ -455,6 +455,11 @@
           "light": "client/images/light/icon-compare-formatted.svg"
         }
       },
+      {
+        "command": "abapfs.togglediffNormalize",
+        "title": "Toggle code normalization",
+        "icon": "$(law)"
+      },
       {
         "command": "abapfs.transportObjectDiff",
         "title": "Diff with current version",
@@ -760,6 +765,10 @@
           "command": "abapfs.opendiffNormalized",
           "when": "hideCommands.never"
         },
+        {
+          "command": "abapfs.togglediffNormalize",
+          "when": "hideCommands.never"
+        },
         {
           "command": "abapfs.clearScmGroup",
           "when": "hideCommands.never"
@@ -1012,6 +1021,11 @@
           "command": "abapfs.activate",
           "group": "navigation",
           "when": "resourceScheme == adt && editorLangId =~ /abap|cds|xml/ && abapfs:showActivate "
+        },
+        {
+          "command": "abapfs.togglediffNormalize",
+          "group": "navigation",
+          "when": "isInDiffEditor && editorLangId =~ /abap/"
         }
       ],
       "editor/title/run": [