Skip to content

Commit

Permalink
Merge pull request #1 from dlvandenberg/feature/control-flows
Browse files Browse the repository at this point in the history
Feature/control flows
  • Loading branch information
dlvandenberg authored Dec 10, 2023
2 parents cd3de81 + eb5386f commit 7848023
Show file tree
Hide file tree
Showing 36 changed files with 22,683 additions and 6,913 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ module.exports = {
},
extends: 'google',
overrides: [],
plugins: ['@stylistic/js'],
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
},
rules: {
'function-call-argument-newline': ['error', 'consistent'],
'object-curly-spacing': 'off',
'quote-props': 'off',
indent: ['error', 2, { SwitchCase: 1 }],
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/src/parser.c linguist-vendored
37 changes: 37 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: CI

on:
push:
branches:
- main
pull_request:

jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
os: [macos-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18

- name: Install setuptools
if: ${{ matrix.os == 'macos-latest' }}
run: sudo -H pip install setuptools

- run: npm install
- run: npm test

test_windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18
- run: npm install
- run: npm run test:windows
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
node_modules
build
*.log
log.html

/target
*.a
*.so
*.o
bindings/c/*.h
bindings/c/*.pc
.build/
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"printWidth": 100,
"printWidth": 90,
"singleQuote": true,
"trailingComma": "all",
"arrowParens": "always",
Expand Down
91 changes: 91 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ version = "0.0.1"
keywords = ["incremental", "parsing", "angular"]
categories = ["parsing", "text-editors"]
repository = "https://github.com/tree-sitter/tree-sitter-angular"
edition = "2023"
edition = "2021"
license = "MIT"

build = "bindings/rust/build.rs"
include = [
"bindings/rust/*",
Expand All @@ -21,6 +20,7 @@ path = "bindings/rust/lib.rs"

[dependencies]
tree-sitter = "~0.20.10"
tree-sitter-html = "~0.19.0"

[build-dependencies]
cc = "1.0"
Loading

0 comments on commit 7848023

Please sign in to comment.