[Diff] Remove side-by-side mode

It causes odd behavior when BOL is changed to allow spaces
sublimehq · Jan 28, 2025 · f3ad356 · f3ad356
1 parent 4cce8fb
commit f3ad356
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 42 deletions.
diff --git a/Diff/Diff.sublime-syntax b/Diff/Diff.sublime-syntax
@@ -40,7 +40,6 @@ contexts:
     - include: diff-deltas
     - include: diff3-edit
     - include: diff3-normal
-    - include: side-by-side
 
 ###[ HEADERS ]#################################################################
 
@@ -305,32 +304,6 @@ contexts:
     - match: '{{bol}}(?:{{conflict_any}})'
       scope: invalid.illegal.conflict.diff
 
-###[ SIDE-BY-SIDE ]############################################################
-
-  # https://www.gnu.org/software/diffutils/manual/diffutils.html#Side-by-Side
-  side-by-side:
-    - match: '{{bol}}(.*)   (<)$'
-      captures:
-        1: markup.deleted.diff
-        2: punctuation.definition.deleted.diff
-    - match: '{{bol}}(.*)   (\()$'
-      captures:
-        1: comment.line.diff
-        2: punctuation.definition.deleted.diff
-    - match: '{{bol}}(.*)   ([\\|/])   (.*)$'
-      captures:
-        1: markup.changed.diff
-        2: punctuation.definition.changed.diff
-        3: markup.changed.diff
-    - match: '{{bol}}   {4,}(>)(?:   (.*))?$'
-      captures:
-        1: punctuation.definition.inserted.diff
-        2: markup.inserted.diff
-    - match: '{{bol}}   {4,}(\))(?:   (.*))?$'
-      captures:
-        1: punctuation.definition.inserted.diff
-        2: comment.line.diff
-
 ###############################################################################
 
 variables:

diff --git a/Diff/tests/syntax_test_diff.diff b/Diff/tests/syntax_test_diff.diff
@@ -583,19 +583,10 @@ hello()
 
 \ https://www.gnu.org/software/diffutils/manual/diffutils.html#Example-Side-by-Side
 The Way that can be told of is n   <
-\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.deleted.diff
-\                                  ^ punctuation.definition.deleted.diff
 The name that can be named is no   <
-\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.deleted.diff
-\                                  ^ punctuation.definition.deleted.diff
 The Nameless is the origin of He        The Nameless is the origin of He
-\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - markup
 The Named is the mother of all t   |    The named is the mother of all t
-\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.changed.diff
-\                                  ^ punctuation.definition.changed.diff
-\                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.changed.diff
                                    >
-\                                  ^ punctuation.definition.inserted.diff
 Therefore let there always be no        Therefore let there always be no
   so we may see their subtlety,           so we may see their subtlety,
 And let there always be being,          And let there always be being,
@@ -604,11 +595,5 @@ The two are the same,                   The two are the same,
 But after they are produced,            But after they are produced,
   they have different names.              they have different names.
                                    >    They both may be called deep and
-\                                  ^ punctuation.definition.inserted.diff
-\                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.inserted.diff
                                    >    Deeper and more profound,
-\                                  ^ punctuation.definition.inserted.diff
-\                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.inserted.diff
                                    >    The door of all subtleties!
-\                                  ^ punctuation.definition.inserted.diff
-\                                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.inserted.diff