Skip to content

Commit

Permalink
Hexadecimal values accept lowercase characters (#10)
Browse files Browse the repository at this point in the history
Updated changelog and bumped version to 0.4.1
Added a bunch of badges to the README and builds now trigger on master
  • Loading branch information
c4deszes authored Nov 15, 2021
1 parent 0a9e79f commit 73f646a
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 21 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
name: Build
on: [pull_request]
on:
push:
branches:
- 'master'
pull_request:
branches:
- 'master'

jobs:
test:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how

## [Unreleased]

## [0.4.1] - 2021-11-15

### Fixed

- Hexadecimal values accept lowercase characters

## [0.4.0] - 2021-11-15

### Added
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@

![GitHub last commit](https://img.shields.io/github/last-commit/c4deszes/ldfsyntax)
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
[![Visual Studio Marketplace](https://img.shields.io/visual-studio-marketplace/v/c4deszes.ldf-syntax)](https://marketplace.visualstudio.com/items?itemName=c4deszes.ldf-syntax)
![Visual Studio Marketplace](https://img.shields.io/visual-studio-marketplace/i/c4deszes.ldf-syntax)

> ldfsyntax adds LIN Description File language support to Visual Studio Code
|Release |Status |
|-|-|
|Visual Studio Marketplace | [![Visual Studio Marketplace](https://img.shields.io/visual-studio-marketplace/v/c4deszes.ldf-syntax)](https://marketplace.visualstudio.com/items?itemName=c4deszes.ldf-syntax) ![Installs](https://img.shields.io/visual-studio-marketplace/i/c4deszes.ldf-syntax) ![Rating](https://img.shields.io/visual-studio-marketplace/r/c4deszes.ldf-syntax)
|Open VSX Registry | [![OpenVSX Marketplace](https://img.shields.io/open-vsx/v/c4deszes/ldf-syntax)](https://open-vsx.org/extension/c4deszes/ldf-syntax) ![Downloads](https://img.shields.io/open-vsx/dt/c4deszes/ldf-syntax) ![Rating](https://img.shields.io/open-vsx/rating/c4deszes/ldf-syntax)
| Trunk | ![Version](https://img.shields.io/github/package-json/v/c4deszes/ldfsyntax) ![Build](https://img.shields.io/github/workflow/status/c4deszes/ldfsyntax/Build/master)

---

## Features
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"lin"
],
"license": "MIT",
"version": "0.4.0",
"version": "0.4.1",
"preview": true,
"publisher": "c4deszes",
"repository": {
Expand Down
34 changes: 17 additions & 17 deletions syntaxes/ldf.tmLanguage.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
"end": "\\s*}"
},
"signal_definition": {
"begin": "(\\w+)\\s*:\\s*((?:0x[0-9]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*(\\w+)\\s*(?:,)?",
"begin": "(\\w+)\\s*:\\s*((?:0x[0-9]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*(\\w+)\\s*(?:,)?",
"captures": {
"1": {
"name": "support.function"
Expand Down Expand Up @@ -213,7 +213,7 @@
"end": "\\s*}"
},
"frame_definition": {
"begin": "(\\w+)\\s*:\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*(\\w+)\\s*(?:,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+)))?\\s*{",
"begin": "(\\w+)\\s*:\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*(\\w+)\\s*(?:,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+)))?\\s*{",
"captures": {
"1": {
"name": "support.function"
Expand All @@ -239,7 +239,7 @@
"end": "\\s*}"
},
"frame_signal": {
"match": "(\\w+)\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*;",
"match": "(\\w+)\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*;",
"captures": {
"1": {
"name": "variable.parameter"
Expand Down Expand Up @@ -267,7 +267,7 @@
"end": "\\s*}"
},
"event_triggered_frames_definition": {
"begin": "(\\w+)\\s*:\\s*(\\w+)\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*(\\w+)\\s*(?:,)?",
"begin": "(\\w+)\\s*:\\s*(\\w+)\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*(\\w+)\\s*(?:,)?",
"captures": {
"1": {
"name": "support.function"
Expand Down Expand Up @@ -307,7 +307,7 @@
"end": "\\s*}"
},
"diagnostic_signal_definition": {
"match": "(\\w+)\\s*:\\s*((?:0x[0-9]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*;",
"match": "(\\w+)\\s*:\\s*((?:0x[0-9]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*;",
"captures": {
"1": {
"name": "support.function"
Expand Down Expand Up @@ -338,7 +338,7 @@
"end": "\\s*}"
},
"diagnostic_frame_definition": {
"begin": "(\\w+)\\s*:\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*{",
"begin": "(\\w+)\\s*:\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*{",
"captures": {
"1": {
"name": "support.function"
Expand All @@ -358,7 +358,7 @@
"end": "\\s*}"
},
"diagnostic_frame_signal": {
"match": "(\\w+)\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*;",
"match": "(\\w+)\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*;",
"captures": {
"1": {
"name": "variable.parameter"
Expand Down Expand Up @@ -444,7 +444,7 @@
}
},
"node_definition_configured_nad": {
"match": "(configured_NAD)\\s*=\\s*(?:(0x[0-9A-F]+)|([0-9]+))\\s*;",
"match": "(configured_NAD)\\s*=\\s*(?:(0x[0-9a-fA-F]+)|([0-9]+))\\s*;",
"captures": {
"1": {
"name": "variable.parameter"
Expand All @@ -455,7 +455,7 @@
}
},
"node_definition_initial_nad": {
"match": "(initial_NAD)\\s*=\\s*(?:(0x[0-9A-F]+)|([0-9]+))\\s*;",
"match": "(initial_NAD)\\s*=\\s*(?:(0x[0-9a-fA-F]+)|([0-9]+))\\s*;",
"captures": {
"1": {
"name": "variable.parameter"
Expand All @@ -466,7 +466,7 @@
}
},
"node_definition_product_id": {
"match": "(product_id)\\s*=\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*(?:,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+)))?\\s*;",
"match": "(product_id)\\s*=\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*(?:,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+)))?\\s*;",
"captures": {
"1": {
"name": "variable.parameter"
Expand Down Expand Up @@ -572,7 +572,7 @@
"end": "\\s*}"
},
"node_definition_configurable_frames_20": {
"match": "(\\w+)\\s*=\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*;",
"match": "(\\w+)\\s*=\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*;",
"captures": {
"1": {
"name": "string"
Expand Down Expand Up @@ -711,7 +711,7 @@
}
},
"schedule_table_conditionalchangenad": {
"match": "(ConditionalChangeNAD)\\s*\\{\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*\\}\\s*(delay)\\s+((?:[0-9]+(?:\\.[0-9]+)?)\\s*ms)\\s*;",
"match": "(ConditionalChangeNAD)\\s*\\{\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*\\}\\s*(delay)\\s+((?:[0-9]+(?:\\.[0-9]+)?)\\s*ms)\\s*;",
"captures": {
"1": {
"name": "keyword"
Expand Down Expand Up @@ -743,7 +743,7 @@
}
},
"schedule_table_datadump": {
"match": "(DataDump)\\s*\\{\\s*(\\w+)\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*\\}\\s*(delay)\\s+((?:[0-9]+(?:\\.[0-9]+)?)\\s*ms)\\s*;",
"match": "(DataDump)\\s*\\{\\s*(\\w+)\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*\\}\\s*(delay)\\s+((?:[0-9]+(?:\\.[0-9]+)?)\\s*ms)\\s*;",
"captures": {
"1": {
"name": "keyword"
Expand Down Expand Up @@ -793,7 +793,7 @@
},

"schedule_table_assignframeidrange": {
"match": "(AssignFrameIdRange)\\s*\\{\\s*(\\w+)\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*(?:,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+)))?\\s*\\}\\s*(delay)\\s+((?:[0-9]+(?:\\.[0-9]+)?)\\s*ms)\\s*;",
"match": "(AssignFrameIdRange)\\s*\\{\\s*(\\w+)\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*(?:,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+)))?\\s*\\}\\s*(delay)\\s+((?:[0-9]+(?:\\.[0-9]+)?)\\s*ms)\\s*;",
"captures": {
"1": {
"name": "keyword"
Expand Down Expand Up @@ -865,7 +865,7 @@
}
},
"schedule_table_freeformat": {
"match": "(FreeFormat)\\s*\\{\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*\\}\\s*(delay)\\s+((?:[0-9]+(?:\\.[0-9]+)?)\\s*ms)\\s*;",
"match": "(FreeFormat)\\s*\\{\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*\\}\\s*(delay)\\s+((?:[0-9]+(?:\\.[0-9]+)?)\\s*ms)\\s*;",
"captures": {
"1": {
"name": "keyword"
Expand Down Expand Up @@ -970,7 +970,7 @@
]
},
"signal_encoding_type_converter_logical": {
"match": "(logical_value)\\s*,\\s*((?:0x[0-9A-F]+)|(?:[0-9]+))\\s*(?:,\\s*(\"[^\"]*\"))?\\s*;",
"match": "(logical_value)\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:[0-9]+))\\s*(?:,\\s*(\"[^\"]*\"))?\\s*;",
"captures": {
"1": {
"name": "variable.parameter"
Expand All @@ -984,7 +984,7 @@
}
},
"signal_encoding_type_converter_physical": {
"match": "(physical_value)\\s*,\\s*((?:0x[0-9A-F]+)|(?:-?[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:-?[0-9]+))\\s*,\\s*((?:0x[0-9A-F]+)|(?:-?[0-9]+(?:\\.[0-9]+)?))\\s*,\\s*((?:0x[0-9A-F]+)|(?:-?[0-9]+(?:\\.[0-9]+)?))\\s*(?:,\\s*(\"[^\"]*\"))?\\s*;",
"match": "(physical_value)\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:-?[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:-?[0-9]+))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:-?[0-9]+(?:\\.[0-9]+)?))\\s*,\\s*((?:0x[0-9a-fA-F]+)|(?:-?[0-9]+(?:\\.[0-9]+)?))\\s*(?:,\\s*(\"[^\"]*\"))?\\s*;",
"captures": {
"1": {
"name": "variable.parameter"
Expand Down

0 comments on commit 73f646a

Please sign in to comment.