Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Package/Scope Selector (XML).sublime-syntax
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ contexts:
operators:
- meta_prepend: true
- match: (&)amp(;)
scope: constant.character.entity.xml keyword.operator.with.scope-selector
scope: constant.character.entity.xml keyword.operator.combinator.with.scope-selector
captures:
1: punctuation.definition.constant.xml
2: punctuation.definition.constant.xml
Expand Down
10 changes: 6 additions & 4 deletions Package/Scope Selector.sublime-syntax
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,17 @@ contexts:
- match: \s+\(
scope: invalid.illegal.operator-required-between-scope-and-group.scope-selector
- match: \s+(?=\w)
scope: keyword.operator.right.scope-selector
scope: keyword.operator.combinator.descendent.scope-selector
pop: true
- match: ''
pop: true

operators:
- match: '>'
scope: keyword.operator.combinator.child.scope-selector
- match: '-'
scope: keyword.operator.without.scope-selector
scope: keyword.operator.combinator.without.scope-selector
- match: '&'
scope: keyword.operator.with.scope-selector
scope: keyword.operator.combinator.with.scope-selector
- match: '[,|]'
scope: keyword.operator.or.scope-selector
scope: keyword.operator.combinator.or.scope-selector
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@ contexts:
scope: invalid.illegal.newline-not-supported-here.sublime-snippet
- match: '(?=</scope>)'
pop: true
- include: scope:source.scope-selector
with_prototype:
- match: '&amp;'
scope: keyword.operator.with.scope-selector
- include: scope:source.scope-selector.xml
- match: '(<)(tabTrigger)(>)'
scope: meta.tag.xml
captures:
Expand Down
14 changes: 7 additions & 7 deletions Package/Sublime Text Snippet/syntax_test_snippet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,14 @@ ${TM_CURRENT_LINE/^\\s*((?:\\/\1/}
# ^^^^ string.unquoted.scope-segment
# ^ punctuation.separator.scope-segments
# ^^^^ string.unquoted.scope-segment
# ^^^^^ keyword.operator.with.scope-selector
# ^^^^^ keyword.operator.combinator.with.scope-selector
# ^^^^ string.unquoted.scope-segment
<scope><![CDATA[text.html &amp; test]]></scope>
# ^^^^^^^^^ invalid.illegal
# ^^^^ string.unquoted.scope-segment
# ^ punctuation.separator.scope-segments
# ^^^^ string.unquoted.scope-segment
# ^^^^^ keyword.operator.with
# ^^^^^ keyword.operator.combinator.with
# ^^^^ string.unquoted.scope-segment
# ^^^ invalid.illegal
<scope>text.html &amp; test
Expand All @@ -312,18 +312,18 @@ ${TM_CURRENT_LINE/^\\s*((?:\\/\1/}
# ^^^^^^ string.unquoted.scope-segment.scope-selector
# ^ punctuation.separator.scope-segments.scope-selector
# ^ string.unquoted.scope-segment.scope-selector
# ^ keyword.operator.or.scope-selector
# ^ keyword.operator.combinator.or.scope-selector
# ^^^^^^ string.unquoted.scope-segment.scope-selector
# ^ punctuation.separator.scope-segments.scope-selector
# ^^^ string.unquoted.scope-segment.scope-selector
# ^ punctuation.section.group.end.scope-selector
# ^^^^^ keyword.operator.with.scope-selector
# ^^^^^ keyword.operator.combinator.with.scope-selector
# ^^^^^^ string.unquoted.scope-segment.scope-selector
# ^ keyword.operator.or.scope-selector
# ^ keyword.operator.combinator.or.scope-selector
# ^ punctuation.section.group.begin.scope-selector
# ^^^^^ keyword.operator.with.scope-selector
# ^^^^^ keyword.operator.combinator.with.scope-selector
# ^ punctuation.section.group.end.scope-selector
# ^ keyword.operator.or.scope-selector
# ^ keyword.operator.combinator.or.scope-selector
# ^^^^^^ string.unquoted.scope-segment.scope-selector

<tabTrigger> </tabTrigger>
Expand Down
14 changes: 7 additions & 7 deletions Package/TextMate Preferences/syntax_test_tmPreferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@
<!-- ^ punctuation.definition.tag.begin.xml -->
<!-- ^^^^^^^^^^^^^^^^^^^^^^^ meta.string.selector.tmPreferences -->
<!-- ^^^ punctuation.definition.tag.end.xml - meta.string - invalid -->
<!-- ^ keyword.operator.with.scope-selector -->
<!-- ^ keyword.operator.combinator.with.scope-selector -->
<!-- ^ punctuation.section.group.begin.scope-selector -->
<!-- ^ keyword.operator.with.scope-selector -->
<!-- ^ keyword.operator.combinator.with.scope-selector -->
<!-- ^ punctuation.section.group.end.scope-selector -->
<key>scope</key>
<string>abc & (def - ghi & jkl &amp; mno)</string>
<!-- ^ invalid.illegal.bad-ampersand.xml -->
<!-- ^ invalid.illegal.bad-ampersand.xml -->
<!-- ^^^^^ constant.character.entity.xml keyword.operator.with.scope-selector -->
<!-- ^^^^^ constant.character.entity.xml keyword.operator.combinator.with.scope-selector -->

<key>settings</key>
<!-- ^^^^^^^^ meta.inside-dict-key.plist keyword.other.settings.tmPreferences-->
Expand Down Expand Up @@ -255,7 +255,7 @@
<!-- ^^^^^ string.unquoted.scope-segment.scope-selector -->
<!-- ^ punctuation.separator.scope-segments.scope-selector -->
<!-- ^^^^^ string.unquoted.scope-segment.scope-selector -->
<!-- ^^^^^ constant.character.entity.xml keyword.operator.with.scope-selector -->
<!-- ^^^^^ constant.character.entity.xml keyword.operator.combinator.with.scope-selector -->
<!-- ^ punctuation.section.group.begin.scope-selector -->
<!-- ^ invalid.illegal.missing-group-end.scope-selector -->
<!-- ^^^^^^^^^ meta.tag.xml - meta.inside-value -->
Expand All @@ -275,12 +275,12 @@
<!-- ^^^^^^^^^^^^^^^ meta.group.scope-selector - meta.group meta.group -->
<!-- ^ punctuation.section.group.begin.scope-selector -->
<!-- ^ punctuation.section.group.begin.scope-selector -->
<!-- ^ keyword.operator.or.scope-selector -->
<!-- ^ keyword.operator.combinator.or.scope-selector -->
<!-- ^ punctuation.section.group.end.scope-selector -->
<!-- ^^^^^ constant.character.entity.xml keyword.operator.with.scope-selector -->
<!-- ^^^^^ constant.character.entity.xml keyword.operator.combinator.with.scope-selector -->
<!-- ^^^^^^ string.unquoted.scope-segment.scope-selector -->
<!-- ^ punctuation.section.group.end.scope-selector -->
<!-- ^^^^^ constant.character.entity.xml keyword.operator.with.scope-selector -->
<!-- ^^^^^ constant.character.entity.xml keyword.operator.combinator.with.scope-selector -->
<!-- ^^^^^^^^^^^ string.unquoted.scope-segment.scope-selector -->
<!-- ^^^^^^^^^^^^^^^^ comment.block.xml -->
</dict>
Expand Down
Loading
Loading