Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Fixed so namespaces syntax works on same lime as <?php #73

Merged
merged 10 commits into from
May 14, 2015
Merged

Fixed so namespaces syntax works on same lime as <?php #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4921f5b
Fixed default short array syntax error
frozzare May 13, 2015
3727095
Added a empty capture to short array syntax
frozzare May 13, 2015
6247fbb
Fixed so namespaces syntax works on same lime as <?php
frozzare May 14, 2015
c2de12f
Added test for namespace on same line
frozzare May 14, 2015
6bbd923
Added test for namespace on own line
frozzare May 14, 2015
fefe52d
Fixed typo
frozzare May 14, 2015
2fe1869
Merge branch 'issue-29' of github.com:frozzare/language-php into issu…
frozzare May 14, 2015
54fcb2e
Changed to non-capturing group
frozzare May 14, 2015
9812a66
Changed to \\s* instead \\s
frozzare May 14, 2015
70150f1
Removed short array patter
frozzare May 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grammars/php.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@
]
}
{
'begin': '(?i)^\\s*(namespace)\\b\\s+(?=([a-z0-9_\\\\]+\\s*($|[;{]|(\\/[\\/*])))|$)'
'begin': '(?i)(?:^\\s*|\\s*)(namespace)\\b\\s+(?=([a-z0-9_\\\\]+\\s*($|[;{]|(\\/[\\/*])))|$)'
'beginCaptures':
'1':
'name': 'keyword.other.namespace.php'
Expand Down
15 changes: 15 additions & 0 deletions spec/php-spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,3 +196,18 @@ describe 'PHP grammar', ->
expect(tokens[1][4]).toEqual value: ' ', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php']
expect(tokens[1][5]).toEqual value: '2', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'constant.numeric.php']
expect(tokens[1][6]).toEqual value: ';', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'punctuation.terminator.expression.php']

it 'should tokenize namespace at the same line as <?php', ->
tokens = grammar.tokenizeLines "<?php namespace Test;"
expect(tokens[0][1]).toEqual value: ' ', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'meta.namespace.php']
expect(tokens[0][2]).toEqual value: 'namespace', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'meta.namespace.php', 'keyword.other.namespace.php']
expect(tokens[0][3]).toEqual value: ' ', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'meta.namespace.php']
expect(tokens[0][4]).toEqual value: 'Test', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'meta.namespace.php', 'entity.name.type.namespace.php']
expect(tokens[0][5]).toEqual value: ';', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'punctuation.terminator.expression.php']

it 'should tokenize namespace correctly', ->
tokens = grammar.tokenizeLines "<?php\nnamespace Test;"
expect(tokens[1][0]).toEqual value: 'namespace', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'meta.namespace.php', 'keyword.other.namespace.php']
expect(tokens[1][1]).toEqual value: ' ', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'meta.namespace.php']
expect(tokens[1][2]).toEqual value: 'Test', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'meta.namespace.php', 'entity.name.type.namespace.php']
expect(tokens[1][3]).toEqual value: ';', scopes: ['text.html.php', 'meta.embedded.block.php', 'source.php', 'punctuation.terminator.expression.php']