Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Java] Rename mapping separator scopes #3274

Merged
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 Java/JavaProperties.sublime-syntax
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ contexts:
- include: escapes
- match: \s*([:=])
captures:
1: punctuation.separator.mapping.key-value.java-props
1: punctuation.separator.key-value.java-props
set: maybe-property-value
- match: \s+(?=\S)
set: maybe-property-value
Expand Down
18 changes: 9 additions & 9 deletions Java/tests/syntax_test_java_properties.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ property_name=Value of Property
# ^^^^^^^^^^^^^^^^^ meta.mapping.value.java-props
# ^ - meta.mapping
#^^^^^^^^^^^^ entity.name.key.java-props
# ^ punctuation.separator.mapping.key-value.java-props
# ^ punctuation.separator.key-value.java-props
# ^^^^^^^^^^^^^^^^^ string.unquoted.java-props
# ^ - meta.mapping

Expand All @@ -33,7 +33,7 @@ property_name = Value of Property
# ^ - meta.mapping
#^^^^^^^^^^^^ entity.name.key.java-props
# ^ - entity.name.key.java-props
# ^ punctuation.separator.mapping.key-value.java-props
# ^ punctuation.separator.key-value.java-props
# ^ - entity.name.key.java-props
# ^^^^^^^^^^^^^^^^^ string.unquoted.java-props

Expand All @@ -43,7 +43,7 @@ property_name:Value of Property
# ^^^^^^^^^^^^^^^^^ meta.mapping.value.java-props
# ^ - meta.mapping
#^^^^^^^^^^^^ entity.name.key.java-props
# ^ punctuation.separator.mapping.key-value.java-props
# ^ punctuation.separator.key-value.java-props
# ^^^^^^^^^^^^^^^^^ string.unquoted.java-props

property_name : Value of Property
Expand All @@ -53,7 +53,7 @@ property_name : Value of Property
# ^ - meta.mapping
#^^^^^^^^^^^^ entity.name.key.java-props
# ^^^^^ - entity.name.key.java-props
# ^ punctuation.separator.mapping.key-value.java-props
# ^ punctuation.separator.key-value.java-props
# ^^^^^ - entity.name.key.java-props
# ^^^^^^^^^^^^^^^^^ string.unquoted.java-props

Expand All @@ -72,21 +72,21 @@ name=
# ^ meta.mapping.java-props
# ^ - meta.mapping
#^^^ entity.name.key.java-props
# ^ punctuation.separator.mapping.key-value.java-props
# ^ punctuation.separator.key-value.java-props
value
#^^^^ meta.mapping.key.java-props
#^^^^ entity.name.key.java-props - string

=value
# <- meta.mapping.java-props punctuation.separator.mapping.key-value.java-props
# <- meta.mapping.java-props punctuation.separator.key-value.java-props
#^^^^^ meta.mapping.value.java-props string.unquoted.java-props

:value
# <- meta.mapping.java-props punctuation.separator.mapping.key-value.java-props
# <- meta.mapping.java-props punctuation.separator.key-value.java-props
#^^^^^ meta.mapping.value.java-props string.unquoted.java-props

name===value
# ^ punctuation.separator.mapping.key-value.java-props
# ^ punctuation.separator.key-value.java-props
# ^^ - punctuation.separator.mapping
# ^^^^^^^ string.unquoted.java-props

Expand All @@ -96,7 +96,7 @@ name\ with\=escap\es\:=Value \ with \nescap\es
# ^^ constant.character.escape.java-props
# ^^ constant.character.escape.java-props
# ^^ constant.character.escape.java-props
# ^ punctuation.separator.mapping.key-value.java-props
# ^ punctuation.separator.key-value.java-props
# ^^^^^^^^^^^^^^^^^^^^^^^ string.unquoted.java-props
# ^^ constant.character.escape.java-props
# ^^ constant.character.escape.java-props
Expand Down