Skip to content

Commit 2677fdc

Browse files
mkhlmkhl
committed
Allow whitespace in here-docs and here-strings
Bash allows whitespace after the here-doc and here-string "operators" (`<<`, `<<-`, `<<<`) just as it does after redirection "operators". This change adds `\s*` to all regexps matching here-strings and the beginnings of here-documents. Closes #33.
1 parent 46e5f29 commit 2677fdc

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

‎Syntaxes/Shell-Unix-Bash.tmLanguage‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@
415415
<array>
416416
<dict>
417417
<key>begin</key>
418-
<string>(&lt;&lt;)-("|'|)(RUBY)\2</string>
418+
<string>(&lt;&lt;)-\s*("|'|)(RUBY)\2</string>
419419
<key>beginCaptures</key>
420420
<dict>
421421
<key>1</key>
@@ -461,7 +461,7 @@
461461
</dict>
462462
<dict>
463463
<key>begin</key>
464-
<string>(&lt;&lt;)("|'|)(RUBY)\2</string>
464+
<string>(&lt;&lt;)\s*("|'|)(RUBY)\2</string>
465465
<key>beginCaptures</key>
466466
<dict>
467467
<key>1</key>
@@ -507,7 +507,7 @@
507507
</dict>
508508
<dict>
509509
<key>begin</key>
510-
<string>(&lt;&lt;)-("|'|)(PYTHON)\2</string>
510+
<string>(&lt;&lt;)-\s*("|'|)(PYTHON)\2</string>
511511
<key>beginCaptures</key>
512512
<dict>
513513
<key>1</key>
@@ -553,7 +553,7 @@
553553
</dict>
554554
<dict>
555555
<key>begin</key>
556-
<string>(&lt;&lt;)("|'|)(PYTHON)\2</string>
556+
<string>(&lt;&lt;)\s*("|'|)(PYTHON)\2</string>
557557
<key>beginCaptures</key>
558558
<dict>
559559
<key>1</key>
@@ -599,7 +599,7 @@
599599
</dict>
600600
<dict>
601601
<key>begin</key>
602-
<string>(&lt;&lt;)-("|'|)(APPLESCRIPT)\2</string>
602+
<string>(&lt;&lt;)-\s*("|'|)(APPLESCRIPT)\2</string>
603603
<key>beginCaptures</key>
604604
<dict>
605605
<key>1</key>
@@ -645,7 +645,7 @@
645645
</dict>
646646
<dict>
647647
<key>begin</key>
648-
<string>(&lt;&lt;)("|'|)(APPLESCRIPT)\2</string>
648+
<string>(&lt;&lt;)\s*("|'|)(APPLESCRIPT)\2</string>
649649
<key>beginCaptures</key>
650650
<dict>
651651
<key>1</key>
@@ -691,7 +691,7 @@
691691
</dict>
692692
<dict>
693693
<key>begin</key>
694-
<string>(&lt;&lt;)-("|'|)(HTML)\2</string>
694+
<string>(&lt;&lt;)-\s*("|'|)(HTML)\2</string>
695695
<key>beginCaptures</key>
696696
<dict>
697697
<key>1</key>
@@ -737,7 +737,7 @@
737737
</dict>
738738
<dict>
739739
<key>begin</key>
740-
<string>(&lt;&lt;)("|'|)(HTML)\2</string>
740+
<string>(&lt;&lt;)\s*("|'|)(HTML)\2</string>
741741
<key>beginCaptures</key>
742742
<dict>
743743
<key>1</key>
@@ -783,7 +783,7 @@
783783
</dict>
784784
<dict>
785785
<key>begin</key>
786-
<string>(&lt;&lt;)-("|'|)(MARKDOWN)\2</string>
786+
<string>(&lt;&lt;)-\s*("|'|)(MARKDOWN)\2</string>
787787
<key>beginCaptures</key>
788788
<dict>
789789
<key>1</key>
@@ -829,7 +829,7 @@
829829
</dict>
830830
<dict>
831831
<key>begin</key>
832-
<string>(&lt;&lt;)("|'|)(MARKDOWN)\2</string>
832+
<string>(&lt;&lt;)\s*("|'|)(MARKDOWN)\2</string>
833833
<key>beginCaptures</key>
834834
<dict>
835835
<key>1</key>
@@ -875,7 +875,7 @@
875875
</dict>
876876
<dict>
877877
<key>begin</key>
878-
<string>(&lt;&lt;)-("|'|)(TEXTILE)\2</string>
878+
<string>(&lt;&lt;)-\s*("|'|)(TEXTILE)\2</string>
879879
<key>beginCaptures</key>
880880
<dict>
881881
<key>1</key>
@@ -921,7 +921,7 @@
921921
</dict>
922922
<dict>
923923
<key>begin</key>
924-
<string>(&lt;&lt;)("|'|)(TEXTILE)\2</string>
924+
<string>(&lt;&lt;)\s*("|'|)(TEXTILE)\2</string>
925925
<key>beginCaptures</key>
926926
<dict>
927927
<key>1</key>
@@ -967,7 +967,7 @@
967967
</dict>
968968
<dict>
969969
<key>begin</key>
970-
<string>(&lt;&lt;)-("|'|)\\?(\w+)\2</string>
970+
<string>(&lt;&lt;)-\s*("|'|)\\?(\w+)\2</string>
971971
<key>beginCaptures</key>
972972
<dict>
973973
<key>1</key>
@@ -1004,7 +1004,7 @@
10041004
</dict>
10051005
<dict>
10061006
<key>begin</key>
1007-
<string>(&lt;&lt;)("|'|)\\?(\w+)\2</string>
1007+
<string>(&lt;&lt;)\s*("|'|)\\?(\w+)\2</string>
10081008
<key>beginCaptures</key>
10091009
<dict>
10101010
<key>1</key>
@@ -1070,7 +1070,7 @@
10701070
</dict>
10711071
</dict>
10721072
<key>match</key>
1073-
<string>(&lt;&lt;&lt;)((')[^']*('))</string>
1073+
<string>(&lt;&lt;&lt;)\s*((')[^']*('))</string>
10741074
<key>name</key>
10751075
<string>meta.herestring.shell</string>
10761076
</dict>
@@ -1099,7 +1099,7 @@
10991099
</dict>
11001100
</dict>
11011101
<key>match</key>
1102-
<string>(&lt;&lt;&lt;)((")(\\("|\\)|[^"])*("))</string>
1102+
<string>(&lt;&lt;&lt;)\s*((")(\\("|\\)|[^"])*("))</string>
11031103
<key>name</key>
11041104
<string>meta.herestring.shell</string>
11051105
</dict>
@@ -1118,7 +1118,7 @@
11181118
</dict>
11191119
</dict>
11201120
<key>match</key>
1121-
<string>(&lt;&lt;&lt;)(([^\s\\]|\\.)+)</string>
1121+
<string>(&lt;&lt;&lt;)\s*(([^\s\\]|\\.)+)</string>
11221122
<key>name</key>
11231123
<string>meta.herestring.shell</string>
11241124
</dict>

0 commit comments

Comments
 (0)