Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: babel/babel-sublime
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: github-linguist/babel-sublime
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Aug 5, 2018

  1. Change scope to avoid conflict with JavaScript grammar 

    Scope changed from source.js to source.js.jsx.
    @pchaigno
    pchaigno committed Aug 5, 2018
    Copy the full SHA
    b660229 View commit details

Commits on Oct 2, 2018

  1. Fix scope names 

    - GitHub's highlighter doesn't support multiple scope names per pattern.
- Some scopes are incorrect according to the TextMate naming conventions.
    @pchaigno
    pchaigno committed Oct 2, 2018
    Copy the full SHA
    23b9074 View commit details

Commits on Mar 1, 2019

  1. Use source.js.regexp provided by the javascript grammar

    @lildude
    lildude committed Mar 1, 2019
    Copy the full SHA
    2c1bc5d View commit details

Commits on Mar 4, 2019

  1. Merge pull request #1 from github-linguist/lildude/use-javascripts-regex 

    Use source.js.regexp provided by the Javascript grammar
    @lildude
    lildude authored Mar 4, 2019
    Copy the full SHA
    dedf347 View commit details
Showing with 38 additions and 38 deletions.
  1. +19 −19 JavaScript (Babel).YAML-tmLanguage
  2. +19 −19 JavaScript (Babel).tmLanguage
38 changes: 19 additions & 19 deletions JavaScript (Babel).YAML-tmLanguage
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [PackageDev] target_format: plist, ext: tmLanguage
name: JavaScript (Babel)
scopeName: source.js
scopeName: source.js.jsx
fileTypes: [js, jsx, babel, es6]
firstLineMatch: ^#!\s*/.*\b(node|js)$\n?

@@ -706,18 +706,18 @@ repository:
- name: meta.function-call.without-arguments.js
match: ([_$a-zA-Z][$\w]*)\s*(\(\s*\))
captures:
'1': {name: variable.function.js}
'1': {name: entity.name.function.js}
'2': {name: meta.group.braces.round.function.arguments.js}

- name: meta.function-call.with-arguments.js
match: ([_$a-zA-Z][$\w]*)\s*(?=\()
captures:
'1': {name: variable.function.js}
'1': {name: entity.name.function.js}

- name: meta.function-call.tagged-template.js
match: ([_$a-zA-Z][$\w]*)\s*(?=`)
captures:
'1': {name: variable.function.js}
'1': {name: entity.name.function.js}

literal-method-call:
patterns:
@@ -731,7 +731,7 @@ repository:
captures:
'1': {name: variable.other.class.js}
'2': {name: keyword.operator.accessor.js}
'3': {name: variable.function.js}
'3': {name: entity.name.function.js}
'4': {name: meta.group.braces.round.function.arguments.js}

- name: meta.function-call.static.with-arguments.js
@@ -744,7 +744,7 @@ repository:
captures:
'1': {name: variable.other.class.js}
'2': {name: keyword.operator.accessor.js}
'3': {name: variable.function.js}
'3': {name: entity.name.function.js}

- name: meta.function-call.method.without-arguments.js
match: >-
@@ -753,7 +753,7 @@ repository:
([_$a-zA-Z][$\w]*)\s*
(\(\s*\))
captures:
'1': {name: variable.function.js}
'1': {name: entity.name.function.js}
'2': {name: meta.group.braces.round.function.arguments.js}

- name: meta.function-call.method.with-arguments.js
@@ -763,7 +763,7 @@ repository:
([_$a-zA-Z][$\w]*)\s*
(?=\()
captures:
'1': {name: variable.function.js}
'1': {name: entity.name.function.js}

literal-language-variable:
patterns:
@@ -1049,7 +1049,7 @@ repository:
'1': {name: punctuation.definition.string.end.js}
'2': {name: keyword.other.js}
patterns:
- include: source.regexp.js
- include: source.js.regexp

literal-string:
patterns:
@@ -1067,10 +1067,10 @@ repository:
literal-template-string:
begin: '`'
beginCaptures:
'0': {name: string.interpolated.js keyword.other.template.begin.js}
'0': {name: keyword.other.template.begin.js}
end: '`'
captures:
'0': {name: string.interpolated.js keyword.other.template.end.js}
'0': {name: keyword.other.template.end.js}
patterns:
- include: '#string-content'
- name: constant.character.escape.js
@@ -1129,7 +1129,7 @@ repository:
- name: meta.styled-components.js
begin: (?<!\.)\b(styled)\s*(?=(\((?>(?>[^()]+)|\g<-1>)*\))\s*`)
captures:
'1': {name: meta.function-call.with-arguments.js variable.function.js}
'1': {name: meta.function-call.with-arguments.js entity.name.function.js}
end: (?<=`)
patterns:
# Like #round-brackets, but with "meta.function-call.with-arguments.js" so
@@ -1267,14 +1267,14 @@ repository:
patterns:
- begin: (<)([_$a-zA-Z][-$:.\w]*[$\w]*)
beginCaptures:
'1': {name: meta.tag.jsx punctuation.definition.tag.begin.jsx}
'2': {name: meta.tag.jsx entity.name.tag.jsx}
'1': {name: punctuation.definition.tag.begin.jsx}
'2': {name: entity.name.tag.html.jsx}
end: (</)(\2)(>)|(/>)
endCaptures:
'1': {name: meta.tag.jsx punctuation.definition.tag.begin.jsx}
'2': {name: meta.tag.jsx entity.name.tag.jsx}
'3': {name: meta.tag.jsx punctuation.definition.tag.end.jsx}
'4': {name: meta.tag.jsx punctuation.definition.tag.end.jsx}
'1': {name: punctuation.definition.tag.begin.jsx}
'2': {name: entity.name.tag.jsx}
'3': {name: punctuation.definition.tag.end.jsx}
'4': {name: punctuation.definition.tag.end.jsx}
patterns:
- include: '#jsx-tag-end'
- include: '#jsx-attributes'
@@ -1285,7 +1285,7 @@ repository:
jsx-tag-end:
begin: '>'
beginCaptures:
'0': {name: meta.tag.jsx punctuation.definition.tag.end.jsx}
'0': {name: punctuation.definition.tag.end.jsx}
end: (?=</)
patterns:
- include: '#jsx-tag-start'
38 changes: 19 additions & 19 deletions JavaScript (Babel).tmLanguage
View file
Original file line number Diff line number Diff line change
@@ -1315,7 +1315,7 @@
<key>0</key>
<dict>
<key>name</key>
<string>meta.tag.jsx punctuation.definition.tag.end.jsx</string>
<string>punctuation.definition.tag.end.jsx</string>
</dict>
</dict>
<key>end</key>
@@ -1348,12 +1348,12 @@
<key>1</key>
<dict>
<key>name</key>
<string>meta.tag.jsx punctuation.definition.tag.begin.jsx</string>
<string>punctuation.definition.tag.begin.jsx</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>meta.tag.jsx entity.name.tag.jsx</string>
<string>entity.name.tag.html.jsx</string>
</dict>
</dict>
<key>end</key>
@@ -1363,22 +1363,22 @@
<key>1</key>
<dict>
<key>name</key>
<string>meta.tag.jsx punctuation.definition.tag.begin.jsx</string>
<string>punctuation.definition.tag.begin.jsx</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>meta.tag.jsx entity.name.tag.jsx</string>
<string>entity.name.tag.html.jsx</string>
</dict>
<key>3</key>
<dict>
<key>name</key>
<string>meta.tag.jsx punctuation.definition.tag.end.jsx</string>
<string>punctuation.definition.tag.end.jsx</string>
</dict>
<key>4</key>
<dict>
<key>name</key>
<string>meta.tag.jsx punctuation.definition.tag.end.jsx</string>
<string>punctuation.definition.tag.end.jsx</string>
</dict>
</dict>
<key>patterns</key>
@@ -2372,7 +2372,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>variable.function.js</string>
<string>entity.name.function.js</string>
</dict>
<key>2</key>
<dict>
@@ -2391,7 +2391,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>variable.function.js</string>
<string>entity.name.function.js</string>
</dict>
</dict>
<key>match</key>
@@ -2405,7 +2405,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>variable.function.js</string>
<string>entity.name.function.js</string>
</dict>
</dict>
<key>match</key>
@@ -2907,7 +2907,7 @@
<key>3</key>
<dict>
<key>name</key>
<string>variable.function.js</string>
<string>entity.name.function.js</string>
</dict>
<key>4</key>
<dict>
@@ -2940,7 +2940,7 @@
<key>3</key>
<dict>
<key>name</key>
<string>variable.function.js</string>
<string>entity.name.function.js</string>
</dict>
</dict>
<key>match</key>
@@ -2958,7 +2958,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>variable.function.js</string>
<string>entity.name.function.js</string>
</dict>
<key>2</key>
<dict>
@@ -2980,7 +2980,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>variable.function.js</string>
<string>entity.name.function.js</string>
</dict>
</dict>
<key>match</key>
@@ -3274,7 +3274,7 @@
<array>
<dict>
<key>include</key>
<string>source.regexp.js</string>
<string>source.js.regexp</string>
</dict>
</array>
</dict>
@@ -3414,15 +3414,15 @@
<key>0</key>
<dict>
<key>name</key>
<string>string.interpolated.js keyword.other.template.begin.js</string>
<string>keyword.other.template.begin.js</string>
</dict>
</dict>
<key>captures</key>
<dict>
<key>0</key>
<dict>
<key>name</key>
<string>string.interpolated.js keyword.other.template.end.js</string>
<string>keyword.other.template.end.js</string>
</dict>
</dict>
<key>end</key>
@@ -3788,7 +3788,7 @@
<key>1</key>
<dict>
<key>name</key>
<string>meta.function-call.with-arguments.js variable.function.js</string>
<string>meta.function-call.with-arguments.js entity.name.function.js</string>
</dict>
</dict>
<key>end</key>
@@ -3998,6 +3998,6 @@
</dict>
</dict>
<key>scopeName</key>
<string>source.js</string>
<string>source.js.jsx</string>
</dict>
</plist>