Skip to content

Commit f3ad356

Browse files
committed
[Diff] Remove side-by-side mode
It causes odd behavior when BOL is changed to allow spaces
1 parent 4cce8fb commit f3ad356

File tree

2 files changed

+0
-42
lines changed

2 files changed

+0
-42
lines changed

Diff/Diff.sublime-syntax

-27
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ contexts:
4040
- include: diff-deltas
4141
- include: diff3-edit
4242
- include: diff3-normal
43-
- include: side-by-side
4443

4544
###[ HEADERS ]#################################################################
4645

@@ -305,32 +304,6 @@ contexts:
305304
- match: '{{bol}}(?:{{conflict_any}})'
306305
scope: invalid.illegal.conflict.diff
307306

308-
###[ SIDE-BY-SIDE ]############################################################
309-
310-
# https://www.gnu.org/software/diffutils/manual/diffutils.html#Side-by-Side
311-
side-by-side:
312-
- match: '{{bol}}(.*) (<)$'
313-
captures:
314-
1: markup.deleted.diff
315-
2: punctuation.definition.deleted.diff
316-
- match: '{{bol}}(.*) (\()$'
317-
captures:
318-
1: comment.line.diff
319-
2: punctuation.definition.deleted.diff
320-
- match: '{{bol}}(.*) ([\\|/]) (.*)$'
321-
captures:
322-
1: markup.changed.diff
323-
2: punctuation.definition.changed.diff
324-
3: markup.changed.diff
325-
- match: '{{bol}} {4,}(>)(?: (.*))?$'
326-
captures:
327-
1: punctuation.definition.inserted.diff
328-
2: markup.inserted.diff
329-
- match: '{{bol}} {4,}(\))(?: (.*))?$'
330-
captures:
331-
1: punctuation.definition.inserted.diff
332-
2: comment.line.diff
333-
334307
###############################################################################
335308

336309
variables:

Diff/tests/syntax_test_diff.diff

-15
Original file line numberDiff line numberDiff line change
@@ -583,19 +583,10 @@ hello()
583583

584584
\ https://www.gnu.org/software/diffutils/manual/diffutils.html#Example-Side-by-Side
585585
The Way that can be told of is n <
586-
\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.deleted.diff
587-
\ ^ punctuation.definition.deleted.diff
588586
The name that can be named is no <
589-
\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.deleted.diff
590-
\ ^ punctuation.definition.deleted.diff
591587
The Nameless is the origin of He The Nameless is the origin of He
592-
\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - markup
593588
The Named is the mother of all t | The named is the mother of all t
594-
\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.changed.diff
595-
\ ^ punctuation.definition.changed.diff
596-
\ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.changed.diff
597589
>
598-
\ ^ punctuation.definition.inserted.diff
599590
Therefore let there always be no Therefore let there always be no
600591
so we may see their subtlety, so we may see their subtlety,
601592
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,
604595
But after they are produced, But after they are produced,
605596
they have different names. they have different names.
606597
> They both may be called deep and
607-
\ ^ punctuation.definition.inserted.diff
608-
\ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.inserted.diff
609598
> Deeper and more profound,
610-
\ ^ punctuation.definition.inserted.diff
611-
\ ^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.inserted.diff
612599
> The door of all subtleties!
613-
\ ^ punctuation.definition.inserted.diff
614-
\ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ markup.inserted.diff

0 commit comments

Comments
 (0)