Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range 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: rescript-lang/rescript-vscode
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db69e034f7d7614ed5e7b361183dd844eace79fc
Choose a base ref
..
head repository: rescript-lang/rescript-vscode
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 433ea56cb1b7c8a86d0c6d277e03102a4aef1a6c
Choose a head ref
Showing with 29 additions and 0 deletions.
  1. +1 −0 CHANGELOG.md
  2. +28 −0 grammars/rescript.tmLanguage.json
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@
- Fix invalid range for `definition`. https://github.com/rescript-lang/rescript-vscode/pull/781
- Don't emit object keys in uppercase as namespace. https://github.com/rescript-lang/rescript-vscode/pull/798
- Fix accidental output of extra `|` when producing exhaustive switch code for polyvariants. https://github.com/rescript-lang/rescript-vscode/pull/805
- Fix JS syntax highlighting in single-line FFI extension points. https://github.com/rescript-lang/rescript-vscode/pull/807

## 1.18.0

28 changes: 28 additions & 0 deletions grammars/rescript.tmLanguage.json
Original file line number Diff line number Diff line change
@@ -508,12 +508,40 @@
"include": "source.js"
}
]
},
"ffi-single": {
"name": "source.embedded.javascript.single",
"match": "(%|%%)(raw|ffi)(\\()(`)(.*?)(`)(\\))",
"captures": {
"1": {
"name": "punctuation.decorator"
},
"2": {
"name": "entity.name.function"
},
"4": {
"name": "punctuation.definition.string.template.begin.embedded-js"
},
"5": {
"patterns": [
{
"include": "source.js"
}
]
},
"6": {
"name": "punctuation.definition.string.template.end.embedded-js"
}
}
}
},
"patterns": [
{
"include": "#storage"
},
{
"include": "#ffi-single"
},
{
"include": "#ffi"
},