Skip to content

Commit 05e623f

Browse files
committed
Merge pull request #25 from Microsoft/i15
Fix issues of quoted field declaration
2 parents 965dc7f + a1a3ca6 commit 05e623f

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ repository:
139139

140140
field-declaration:
141141
name: meta.field.declaration.ts
142-
begin: '(?<!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))'
142+
begin: (?<!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))
143143
beginCaptures:
144144
'1': { name: variable.ts }
145145
'2': { name: keyword.operator.ts }

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@
387387
<key>field-declaration</key>
388388
<dict>
389389
<key>begin</key>
390-
<string>(?&lt;!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))</string>
390+
<string>(?&lt;!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))</string>
391391
<key>beginCaptures</key>
392392
<dict>
393393
<key>1</key>

TypeScriptReact.YAML-tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ repository:
142142

143143
field-declaration:
144144
name: meta.field.declaration.tsx
145-
begin: '(?<!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))'
145+
begin: (?<!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))
146146
beginCaptures:
147147
'1': { name: variable.tsx }
148148
'2': { name: keyword.operator.tsx }

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
<key>field-declaration</key>
349349
<dict>
350350
<key>begin</key>
351-
<string>(?&lt;!\()\s*\b([a-zA-Z_$][\w$]*)\s*(\?\s*)?(?=(=|:))</string>
351+
<string>(?&lt;!\()\s*((?:\b[a-zA-Z_$][\w$]*)|(?:\'[^']*\')|(?:\"[^"]*\"))\s*(\?\s*)?(?=(=|:))</string>
352352
<key>beginCaptures</key>
353353
<dict>
354354
<key>1</key>

0 commit comments

Comments
 (0)