• Adding a line: ✅
  • Removing a line: ✅
  • Modifying a line: ✅
  • Moving a codeblock: ❌ i see you’ve rewritten everything, let me just highlight it all.

RIP reviewers on my PR.

(Meme created by my coworker)

  • bleistift2@feddit.deEnglish
    83·
    2 years ago

    I’m surprised that after almost 20 years of versioning C code, git still manages to assign the closing brace of a function wrongly.

  • killeronthecorner@lemmy.worldEnglish
    34·
    2 years ago

    I’m convinced there must be a way of using ASTs to do more intelligent diffing of a given programming language, but I’m far too lazy to find out for myself.

    • kibiz0r@midwest.socialEnglish
      6·
      2 years ago

      There have been some attempts at semantic diffs, but it’s very uhh… difficult to gain traction with such a thing.

    • sim642@lemm.ee
      5·
      2 years ago

      Diffing algorithms on trees might not be as efficient, especially if they have to find arbitrary node moves.

        • sim642@lemm.ee
          31·
          2 years ago

          It’s not necessarily about the load, it’s about the algorithmic complexity. Going from lists (lines in a file, characters in a line) to trees introduces a potentially exponential increase in complexity due to the number of ways the same list of elements can be organized into a tree.

          Also, you’re underestimating the amount of processing. It’s not about pure CPU computations but RAM access or even I/O. Even existing non-semantic diff implementations are unexpectedly inadequate in terms of performance. You clearly haven’t tried diffing multi-GB log files.

          • killeronthecorner@lemmy.worldEnglish
            1·
            2 years ago

            Log files wouldn’t fall under the banner of compiled languages or ASTs, so I’m not sure how that example applies.

            And I’m aware that it can lead to O(n²) complexity but, as others have provided, there are already tools that do this, so it is within the capabilities of modern processors

            Yes there will be cases where the size of the search space will make it prohibitive to run in reasonable times but this is - by merit of the existing tools and the fact that they seem to work quite well - an edge case.

            • sim642@lemm.ee
              11·
              2 years ago

              Log files themselves don’t, but I’m just comparing it with simpler files with simpler structure with simpler algorithms with better complexity.

    • PeriodicallyPedantic@lemmy.caOP
      3·
      2 years ago

      That’s awesome. I wonder how it’d handle moving plus a small change.

      Too bad GitHub doesn’t support it yet afaict. But at least it’s not all diff tools.

  • saigot@lemmy.ca
    20·
    2 years ago

    Me adding one if statement around around a code block. Ah shit I guess I own the whole function now.

    • alokir@lemmy.world
      13·
      2 years ago

      that’s not even a joke, I’m using intellij community as a merge and diff tool exclusively. it doesn’t support the language I want but even without it it’s better then anything else.

  • dragnucs@lemmy.ml
    112·
    2 years ago

    Most diff tools have an option to ignore leading or trailing whitespace changes.

  • nicoweio@lemmy.world
    91·
    2 years ago

    VSCode has had that feature for some months now. Maybe it’s still hidden behind an off-by-default setting, but it’s there and I use it.

  • csm10495@sh.itjust.worksEnglish
    4·
    2 years ago

    Give me some love for adding an indent level either showing nothing changed or you rewrote everything too.

  • MJBrune@beehaw.orgEnglish
    4·
    2 years ago

    Perforce diff works better than this. Even my basic Git/Gitlab diffs don’t do this.