Skip to content

Commit 2a52ae1

Browse files
committed
Fixing issue 89
1 parent dbb24c8 commit 2a52ae1

File tree

7 files changed

+36
-4
lines changed

7 files changed

+36
-4
lines changed

TypeScript.YAML-tmLanguage

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

8787
object-heritage:
8888
name: meta.object.heritage.ts
89-
begin: '(?:\b(extends|implements))'
89+
begin: '(?:\s*\b(extends|implements)\b)'
9090
beginCaptures:
9191
'1': { name: keyword.other.ts }
9292
end: (?=\{)

TypeScript.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@
998998
<key>object-heritage</key>
999999
<dict>
10001000
<key>begin</key>
1001-
<string>(?:\b(extends|implements))</string>
1001+
<string>(?:\s*\b(extends|implements)\b)</string>
10021002
<key>beginCaptures</key>
10031003
<dict>
10041004
<key>1</key>

TypeScriptReact.YAML-tmLanguage

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

8989
object-heritage:
9090
name: meta.object.heritage.tsx
91-
begin: '(?:\b(extends|implements))'
91+
begin: '(?:\s*\b(extends|implements)\b)'
9292
beginCaptures:
9393
'1': { name: keyword.other.tsx }
9494
end: (?=\{)

TypeScriptReact.tmLanguage

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1364,7 +1364,7 @@
13641364
<key>object-heritage</key>
13651365
<dict>
13661366
<key>begin</key>
1367-
<string>(?:\b(extends|implements))</string>
1367+
<string>(?:\s*\b(extends|implements)\b)</string>
13681368
<key>beginCaptures</key>
13691369
<dict>
13701370
<key>1</key>

npm-debug.log

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
0 info it worked if it ends with ok
2+
1 verbose cli [ 'C:\\Program Files\\nodejs\\node.exe',
3+
1 verbose cli 'C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js',
4+
1 verbose cli 'test' ]
5+
2 info using [email protected]
6+
3 info using [email protected]
7+
4 verbose stack Error: ENOENT: no such file or directory, open 'C:\Users\anubmat\TypeScript-TmLanguage\package.json'
8+
4 verbose stack at Error (native)
9+
5 verbose cwd C:\Users\anubmat\TypeScript-TmLanguage
10+
6 error Windows_NT 10.0.10240
11+
7 error argv "C:\\Program Files\\nodejs\\node.exe" "C:\\Program Files\\nodejs\\node_modules\\npm\\bin\\npm-cli.js" "test"
12+
8 error node v4.3.1
13+
9 error npm v2.14.12
14+
10 error path C:\Users\anubmat\TypeScript-TmLanguage\package.json
15+
11 error code ENOENT
16+
12 error errno -4058
17+
13 error syscall open
18+
14 error enoent ENOENT: no such file or directory, open 'C:\Users\anubmat\TypeScript-TmLanguage\package.json'
19+
14 error enoent This is most likely not a problem with npm itself
20+
14 error enoent and is related to npm not being able to find a file.
21+
15 verbose exit [ -4058, true ]

tests/baselines/Issue89.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[1, 14]: source.ts meta.declaration.object.ts meta.object.name.ts entity.name.class.ts
2+
[1, 25]: source.ts meta.declaration.object.ts meta.object.heritage.ts keyword.other.ts
3+
[1, 37]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
4+
[1, 41]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts keyword.other.ts
5+
[1, 56]: source.ts meta.declaration.object.ts meta.object.heritage.ts meta.object.heritage.ts meta.object.heritage.parent.ts storage.type.ts
6+
[2, 2]: source.ts meta.declaration.object.ts meta.object.body.ts
7+
[4, 1]: source.ts

tests/cases/Issue89.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export class ^FileLogger ^extends /**/^One ^implements/**/ ^IDisposable{
2+
^
3+
}
4+
^

0 commit comments

Comments
 (0)