Skip to content

Commit 6c680fd

Browse files
1st11st1
committed
Simplify strings rules & scopes
1 parent c58247d commit 6c680fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+574
-1169
lines changed

‎grammars/MagicPython.YAML-tmLanguage‎

Lines changed: 10 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -55,31 +55,16 @@ repository:
5555

5656
- file: 'pystring.inc.yaml'
5757
vars:
58-
quote: single
5958
line: single
60-
marker: "\\'"
59+
marker: "\\'|\""
6160
guard: "|((?<!\\\\)\\n)"
6261

6362
- file: 'pystring.inc.yaml'
6463
vars:
65-
quote: single
6664
line: multi
67-
marker: "\\'\\'\\'"
65+
marker: "\\'\\'\\'|\"\"\""
6866
guard: ""
6967

70-
- file: 'pystring.inc.yaml'
71-
vars:
72-
quote: double
73-
line: single
74-
marker: '\"'
75-
guard: "|((?<!\\\\)\\n)"
76-
77-
- file: 'pystring.inc.yaml'
78-
vars:
79-
quote: double
80-
line: multi
81-
marker: '\"\"\"'
82-
guard: ""
8368

8469
statement:
8570
patterns:
@@ -449,22 +434,14 @@ repository:
449434

450435
string:
451436
patterns:
452-
- include: '#string-single-quoted-multi-line'
453-
- include: '#string-double-quoted-multi-line'
454-
- include: '#string-single-quoted-single-line'
455-
- include: '#string-double-quoted-single-line'
456-
- include: '#string-bin-single-quoted-multi-line'
457-
- include: '#string-bin-double-quoted-multi-line'
458-
- include: '#string-bin-single-quoted-single-line'
459-
- include: '#string-bin-double-quoted-single-line'
460-
- include: '#string-raw-single-quoted-multi-line'
461-
- include: '#string-raw-double-quoted-multi-line'
462-
- include: '#string-raw-single-quoted-single-line'
463-
- include: '#string-raw-double-quoted-single-line'
464-
- include: '#string-raw-bin-single-quoted-multi-line'
465-
- include: '#string-raw-bin-double-quoted-multi-line'
466-
- include: '#string-raw-bin-single-quoted-single-line'
467-
- include: '#string-raw-bin-double-quoted-single-line'
437+
- include: '#string-quoted-multi-line'
438+
- include: '#string-quoted-single-line'
439+
- include: '#string-bin-quoted-multi-line'
440+
- include: '#string-bin-quoted-single-line'
441+
- include: '#string-raw-quoted-multi-line'
442+
- include: '#string-raw-quoted-single-line'
443+
- include: '#string-raw-bin-quoted-multi-line'
444+
- include: '#string-raw-bin-quoted-single-line'
468445

469446
string-unicode-guts:
470447
patterns:

0 commit comments

Comments
 (0)