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

Update repository and add modeline support #125

Merged
merged 4 commits into from
Mar 11, 2024
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
39 changes: 39 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{json,toml,yml,gyp}]
indent_style = space
indent_size = 2

[*.js]
indent_style = space
indent_size = 2

[*.rs]
indent_style = space
indent_size = 4

[*.{c,cc,h}]
indent_style = space
indent_size = 4

[*.{py,pyi}]
indent_style = space
indent_size = 4

[*.swift]
indent_style = space
indent_size = 4

[*.go]
indent_style = tab
indent_size = 8

[Makefile]
indent_style = tab
indent_size = 8
15 changes: 9 additions & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
src/keywords.h linguist-generated
* text eol=lf

src/*.json linguist-generated
src/parser.c linguist-generated
src/grammar.json linguist-generated
src/node-types.json linguist-generated
src/tree_sitter/** linguist-generated
package-lock.json linguist-generated
binding.gyp linguist-generated
src/tree_sitter/* linguist-generated

bindings/** linguist-generated
binding.gyp linguist-generated
setup.py linguist-generated
Makefile linguist-generated
Package.swift linguist-generated
116 changes: 105 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,115 @@
name: Run tree-sitter tests
name: CI

on:
push:
branches: [ master ]
branches: [master]
paths:
- grammar.js
- src/**
- test/**
- bindings/**
- binding.gyp
pull_request:
branches: [ master ]
branches: [master]
paths:
- grammar.js
- src/**
- test/**
- bindings/**
- binding.gyp

concurrency:
group: ${{github.workflow}}-${{github.ref}}
cancel-in-progress: true

jobs:
test:
name: Tree-sitter tests
runs-on: ubuntu-latest
runs-on: ${{matrix.os}}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-14]
steps:
- uses: actions/checkout@v4

- uses: actions/setup-node@v4
- name: Install Dependencies
run: npm install

- name: Set up repository
uses: tree-sitter/[email protected]
with:
node-version: 20
- name: Clone nvim help files
uses: actions/checkout@v4
with:
repository: neovim/neovim
path: examples/neovim
sparse-checkout: runtime/doc/
- name: Run tests
run: npm test
uses: tree-sitter/[email protected]
with:
test-library: ${{runner.os == 'Linux'}}
corpus-files: |-
examples/neovim/runtime/doc/*
# FIXME: these files should not have errors
invalid-files: |-
examples/neovim/runtime/doc/builtin.txt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Presumably the "errors" are the ones ignored by gen_help_html.lua: https://github.com/neovim/neovim/blob/bbb68e2a034ad3aaea99178c09301ca458ee8dff/scripts/gen_help_html.lua#L329-L331

Likely the best solution is to fix the help files themselves.

examples/neovim/runtime/doc/change.txt
examples/neovim/runtime/doc/cmdline.txt
examples/neovim/runtime/doc/dev_style.txt
examples/neovim/runtime/doc/dev_tools.txt
examples/neovim/runtime/doc/develop.txt
examples/neovim/runtime/doc/diagnostic.txt
examples/neovim/runtime/doc/editing.txt
examples/neovim/runtime/doc/eval.txt
examples/neovim/runtime/doc/faq.txt
examples/neovim/runtime/doc/fold.txt
examples/neovim/runtime/doc/ft_ada.txt
examples/neovim/runtime/doc/ft_ps1.txt
examples/neovim/runtime/doc/ft_sql.txt
examples/neovim/runtime/doc/help.txt
examples/neovim/runtime/doc/helphelp.txt
examples/neovim/runtime/doc/if_perl.txt
examples/neovim/runtime/doc/if_pyth.txt
examples/neovim/runtime/doc/if_ruby.txt
examples/neovim/runtime/doc/indent.txt
examples/neovim/runtime/doc/index.txt
examples/neovim/runtime/doc/intro.txt
examples/neovim/runtime/doc/job_control.txt
examples/neovim/runtime/doc/lsp.txt
examples/neovim/runtime/doc/luaref.txt
examples/neovim/runtime/doc/map.txt
examples/neovim/runtime/doc/mbyte.txt
examples/neovim/runtime/doc/motion.txt
examples/neovim/runtime/doc/news.txt
examples/neovim/runtime/doc/nvim.txt
examples/neovim/runtime/doc/options.txt
examples/neovim/runtime/doc/pattern.txt
examples/neovim/runtime/doc/pi_gzip.txt
examples/neovim/runtime/doc/pi_health.txt
examples/neovim/runtime/doc/pi_msgpack.txt
examples/neovim/runtime/doc/pi_netrw.txt
examples/neovim/runtime/doc/pi_paren.txt
examples/neovim/runtime/doc/pi_tar.txt
examples/neovim/runtime/doc/pi_tutor.txt
examples/neovim/runtime/doc/pi_zip.txt
examples/neovim/runtime/doc/provider.txt
examples/neovim/runtime/doc/quickfix.txt
examples/neovim/runtime/doc/quickref.txt
examples/neovim/runtime/doc/remote_plugin.txt
examples/neovim/runtime/doc/repeat.txt
examples/neovim/runtime/doc/russian.txt
examples/neovim/runtime/doc/starting.txt
examples/neovim/runtime/doc/syntax.txt
examples/neovim/runtime/doc/tabpage.txt
examples/neovim/runtime/doc/tips.txt
examples/neovim/runtime/doc/ui.txt
examples/neovim/runtime/doc/usr_02.txt
examples/neovim/runtime/doc/usr_03.txt
examples/neovim/runtime/doc/usr_07.txt
examples/neovim/runtime/doc/usr_11.txt
examples/neovim/runtime/doc/usr_12.txt
examples/neovim/runtime/doc/usr_22.txt
examples/neovim/runtime/doc/usr_28.txt
examples/neovim/runtime/doc/usr_29.txt
examples/neovim/runtime/doc/usr_41.txt
examples/neovim/runtime/doc/various.txt
examples/neovim/runtime/doc/vim_diff.txt
examples/neovim/runtime/doc/visual.txt
examples/neovim/runtime/doc/windows.txt
32 changes: 31 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,32 @@
# Rust artifacts
Cargo.lock
target/

node_modules
# Node artifacts
build/
prebuilds/
node_modules/

# Swift artifacts
.build/

# Python artifacts
dist/
*.egg-info
*.whl

# C artifacts
*.a
*.so
*.so.*
*.dylib
*.dll
*.pc

# Examples
/examples/*/

# Grammar volatiles
*.wasm
*.obj
*.o
21 changes: 9 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
[package]
name = "tree-sitter-vimdoc"
description = "Vimdoc grammar for the tree-sitter parsing library"
version = "2.2.0"
description = "Vim help file grammar for tree-sitter"
version = "2.3.0"
license = "Apache-2.0"
keywords = ["incremental", "parsing", "neovim", "vimdoc"]
categories = ["parsing", "text-editors"]
repository = "https://github.com/neovim/tree-sitter-vimdoc"
edition = "2018"
license = "Apache-2.0"
authors = ["Thomas Vigouroux <[email protected]>"]
edition = "2021"
autoexamples = false

build = "bindings/rust/build.rs"
include = [
"bindings/rust/*",
"grammar.js",
"queries/*",
"src/*",
]
include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]

[lib]
path = "bindings/rust/lib.rs"

[dependencies]
tree-sitter = "~0.20.8"
tree-sitter = ">=0.21.0"

[build-dependencies]
cc = "1.0"
cc = "^1.0.89"
124 changes: 109 additions & 15 deletions Makefile

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

Loading
Loading