Skip to content

Commit c057ce9

Browse files
basaratbasarat
committed
Merge pull request #900 from joshheyse/string-highlighting
Fix String Highlighting
2 parents 50b7552 + e02410e commit c057ce9

File tree

3 files changed

+45
-30
lines changed

3 files changed

+45
-30
lines changed

‎grammars/ts.cson‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ repository:
602602
"2":
603603
name: "keyword.other.ts"
604604
"3":
605-
name: "es6import.path.string"
605+
name: "es6import.path.quoted.string"
606606
}
607607
{
608608
comment: "Match import = require"
@@ -615,7 +615,7 @@ repository:
615615
"3":
616616
name: "keyword.other.ts"
617617
"4":
618-
name: "require.path.string"
618+
name: "require.path.quoted.string"
619619
}
620620
{
621621
comment: "Match <amd-module"
@@ -624,7 +624,7 @@ repository:
624624
"1":
625625
name: "keyword.other.ts"
626626
"2":
627-
name: "amd.path.string"
627+
name: "amd.path.quoted.string"
628628
"3":
629629
name: "keyword.other.ts"
630630
}
@@ -635,7 +635,7 @@ repository:
635635
"1":
636636
name: "keyword.other.ts"
637637
"2":
638-
name: "amd.path.string"
638+
name: "amd.path.quoted.string"
639639
"3":
640640
name: "keyword.other.ts"
641641
}
@@ -646,7 +646,7 @@ repository:
646646
"1":
647647
name: "keyword.other.ts"
648648
"2":
649-
name: "reference.path.string"
649+
name: "reference.path.quoted.string"
650650
"3":
651651
name: "keyword.other.ts"
652652
}
@@ -862,7 +862,7 @@ repository:
862862
}
863863
]
864864
"qstring-double":
865-
name: "string.double.ts"
865+
name: "string.double.quoted.ts"
866866
begin: "\""
867867
end: "\"|(?=$)"
868868
patterns: [
@@ -871,7 +871,7 @@ repository:
871871
}
872872
]
873873
"qstring-single":
874-
name: "string.single.ts"
874+
name: "string.single.quoted.ts"
875875
begin: "'"
876876
end: "'|(?=$)"
877877
patterns: [
@@ -880,7 +880,7 @@ repository:
880880
}
881881
]
882882
regex:
883-
name: "string.regex.ts"
883+
name: "string.quoted.regex.ts"
884884
begin: "(?<=[=(:,\\[]|^|return|&&|\\|\\||!)\\s*(/)(?![/*+{}?])"
885885
end: "$|(/)[igm]*"
886886
patterns: [
@@ -894,7 +894,7 @@ repository:
894894
}
895895
]
896896
string:
897-
name: "string.ts"
897+
name: "string.quoted.ts"
898898
patterns: [
899899
{
900900
include: "#qstring-single"
@@ -908,11 +908,11 @@ repository:
908908
begin: "`"
909909
beginCaptures:
910910
"0":
911-
name: "string.template.ts"
911+
name: "string.quoted.template.ts"
912912
end: "`"
913913
endCaptures:
914914
"0":
915-
name: "string.template.ts"
915+
name: "string.quoted.template.ts"
916916
patterns: [
917917
{
918918
include: "#template-substitution-element"
@@ -922,7 +922,7 @@ repository:
922922
}
923923
]
924924
"template-string-contents":
925-
name: "string.template.ts"
925+
name: "string.quoted.template.ts"
926926
begin: ".*?"
927927
end: "(?=(\\$\\{|`))"
928928
patterns: [
@@ -1032,4 +1032,4 @@ repository:
10321032
match: "\\b(static)\\b"
10331033
"property-accessor":
10341034
name: "storage.type.property.ts"
1035-
match: "\\b(get|set)\\b"
1035+
match: "\\b(get|set)\\b"

‎grammars/tsx.cson‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ repository:
602602
"2":
603603
name: "keyword.other.ts"
604604
"3":
605-
name: "es6import.path.string"
605+
name: "es6import.path.quoted.string"
606606
}
607607
{
608608
comment: "Match import = require"
@@ -615,7 +615,7 @@ repository:
615615
"3":
616616
name: "keyword.other.ts"
617617
"4":
618-
name: "require.path.string"
618+
name: "require.path.quoted.string"
619619
}
620620
{
621621
comment: "Match <amd-module"
@@ -624,7 +624,7 @@ repository:
624624
"1":
625625
name: "keyword.other.ts"
626626
"2":
627-
name: "amd.path.string"
627+
name: "amd.path.quoted.string"
628628
"3":
629629
name: "keyword.other.ts"
630630
}
@@ -635,7 +635,7 @@ repository:
635635
"1":
636636
name: "keyword.other.ts"
637637
"2":
638-
name: "amd.path.string"
638+
name: "amd.path.quoted.string"
639639
"3":
640640
name: "keyword.other.ts"
641641
}
@@ -646,7 +646,7 @@ repository:
646646
"1":
647647
name: "keyword.other.ts"
648648
"2":
649-
name: "reference.path.string"
649+
name: "reference.path.quoted.string"
650650
"3":
651651
name: "keyword.other.ts"
652652
}
@@ -847,7 +847,7 @@ repository:
847847
}
848848
]
849849
"qstring-double":
850-
name: "string.double.tsx"
850+
name: "string.quoted.double.tsx"
851851
begin: "\""
852852
end: "\"|(?=$)"
853853
patterns: [
@@ -856,7 +856,7 @@ repository:
856856
}
857857
]
858858
"qstring-single":
859-
name: "string.single.tsx"
859+
name: "string.quoted.single.tsx"
860860
begin: "'"
861861
end: "'|(?=$)"
862862
patterns: [
@@ -865,7 +865,7 @@ repository:
865865
}
866866
]
867867
regex:
868-
name: "string.regex.tsx"
868+
name: "string.quoted.regex.tsx"
869869
begin: "(?<=[=(:,\\[]|^|return|&&|\\|\\||!)\\s*(/)(?![/*+{}?])"
870870
end: "$|(/)[igm]*"
871871
patterns: [
@@ -893,11 +893,11 @@ repository:
893893
begin: "`"
894894
beginCaptures:
895895
"0":
896-
name: "string.template.tsx"
896+
name: "string.quoted.template.tsx"
897897
end: "`"
898898
endCaptures:
899899
"0":
900-
name: "string.template.tsx"
900+
name: "string.quoted.template.tsx"
901901
patterns: [
902902
{
903903
include: "#template-substitution-element"
@@ -907,7 +907,7 @@ repository:
907907
}
908908
]
909909
"template-string-contents":
910-
name: "string.template.tsx"
910+
name: "string.quoted.template.tsx"
911911
begin: ".*?"
912912
end: "(?=(\\$\\{|`))"
913913
patterns: [
@@ -1231,4 +1231,4 @@ repository:
12311231
}
12321232
]
12331233
}
1234-
]
1234+
]

‎scripts/grammar.js‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var atomPatterns = [
2222
name: 'keyword.other.ts'
2323
},
2424
'2': {
25-
name: 'reference.path.string'
25+
name: 'reference.path.string.quoted'
2626
},
2727
'3': {
2828
name: 'keyword.other.ts'
@@ -37,7 +37,7 @@ var atomPatterns = [
3737
name: 'keyword.other.ts'
3838
},
3939
'2': {
40-
name: 'amd.path.string'
40+
name: 'amd.path.string.quoted'
4141
},
4242
'3': {
4343
name: 'keyword.other.ts'
@@ -52,7 +52,7 @@ var atomPatterns = [
5252
name: 'keyword.other.ts'
5353
},
5454
'2': {
55-
name: 'amd.path.string'
55+
name: 'amd.path.string.quoted'
5656
},
5757
'3': {
5858
name: 'keyword.other.ts'
@@ -73,7 +73,7 @@ var atomPatterns = [
7373
name: 'keyword.other.ts'
7474
},
7575
'4': {
76-
name: 'require.path.string'
76+
name: 'require.path.string.quoted'
7777
}
7878
}
7979
},
@@ -88,7 +88,7 @@ var atomPatterns = [
8888
name: 'keyword.other.ts'
8989
},
9090
'3': {
91-
name: 'es6import.path.string'
91+
name: 'es6import.path.string.quoted'
9292
}
9393
}
9494
}
@@ -99,9 +99,24 @@ Promise.all([
9999
request('https://raw.githubusercontent.com/Microsoft/TypeScript-TmLanguage/master/TypeScriptReact.YAML-tmLanguage')
100100
])
101101
.then(function (result) {
102+
var name
102103
var ts = yaml.safeLoad(result[0].body)
103104
var tsx = yaml.safeLoad(result[1].body)
104105

106+
for(var key in ts.repository) {
107+
name = ts.repository[key].name
108+
if(name && name.indexOf('string.quoted') === -1) {
109+
ts.repository[key].name = name.replace('string', 'string.quoted')
110+
}
111+
}
112+
113+
for(var key in tsx.repository) {
114+
name = tsx.repository[key].name
115+
if(name && name.indexOf('string.quoted') === -1) {
116+
tsx.repository[key].name = name.replace('string', 'string.quoted')
117+
}
118+
}
119+
105120
atomPatterns.forEach(function (pattern) {
106121
ts.repository.expression.patterns.unshift(pattern)
107122
tsx.repository.expression.patterns.unshift(pattern)

0 commit comments

Comments
 (0)