sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from theHamsta/fix-at-in-identifier 

Allow `@` in identifiers, relicense under MIT
pull/70/head
Stephan Seitz 2021-11-25 22:15:29 +07:00 committed by GitHub
parent 533375a710 8c2cdcc4c5
commit 0e6fb49af1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 311 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
LICENSE.md
Unescape Escape View File

@ -1,16 +1,21 @@
tree-sitter-common-lisp
Copyright © 2021 Stephan Seitz
The MIT License (MIT)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Copyright (c) 2021 Stephan Seitz
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

6
grammar.js
Unescape Escape View File

@ -25,10 +25,10 @@ const PREC = {
}
const SYMBOL_HEAD =
/[^:\f\n\r\t ()\[\]{}"@^;`\\,#'\u000B\u001C\u001D\u001E\u001F\u2028\u2029\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2008\u2009\u200a\u205f\u3000]/;
/[^:\f\n\r\t ()\[\]{}"^;`\\,#'\u000B\u001C\u001D\u001E\u001F\u2028\u2029\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2008\u2009\u200a\u205f\u3000]/;
const SYMBOL_WITHOUT_SLASH =
/[^:\f\n\r\t ()\[\]{}"@^;/`\\,#'\u000B\u001C\u001D\u001E\u001F\u2028\u2029\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2008\u2009\u200a\u205f\u3000]/;
/[^:\f\n\r\t ()\[\]{}"^;/`\\,#'\u000B\u001C\u001D\u001E\u001F\u2028\u2029\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2008\u2009\u200a\u205f\u3000]/;
const SYMBOL_BODY =
choice(SYMBOL_HEAD,
@ -320,7 +320,7 @@ module.exports = grammar(clojure, {
kwd_symbol: _ =>
seq(SYMBOL),
self_referential_reader_macro: _ => /#\d+[=#]/,
self_referential_reader_macro: _ => /#\d+[=#]/,
_form: $ =>
seq(optional('#'),

49
package-lock.json generated
Unescape Escape View File

@ -5,25 +5,26 @@
"requires": true,
"packages": {
"": {
"name": "tree-sitter-commonlisp",
"version": "0.2.0",
"license": "GPL-3.0-or-later",
"dependencies": {
"nan": "^2.14.2",
"tree-sitter-clojure": "git://github.com:sogaiu/tree-sitter-clojure.git#95c7959c461406381b42113dcf4591008c663d21"
"tree-sitter-clojure": "git@github.com:theHamsta/tree-sitter-clojure-1.git#95c7959c461406381b42113dcf4591008c663d21"
},
"devDependencies": {
"tree-sitter-cli": "^0.19.4"
}
},
"node_modules/nan": {
"version": "2.14.2",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
"version": "2.15.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
"integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
},
"node_modules/tree-sitter-cli": {
"version": "0.19.4",
"resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.19.4.tgz",
"integrity": "sha512-p2kxjuoQeauXBu5eE+j7c5BMCRXmc17EiAswnnWn3ieUlHXBkA0Z7vRnaCSElDR34MhZnSgqgzuuzQk0cDqCjw==",
"version": "0.19.5",
"resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.19.5.tgz",
"integrity": "sha512-kRzKrUAwpDN9AjA3b0tPBwT1hd8N2oQvvvHup2OEsX6mdsSMLmAvR+NSqK9fe05JrRbVvG8mbteNUQsxlMQohQ==",
"dev": true,
"hasInstallScript": true,
"bin": {
@ -32,13 +33,18 @@
},
"node_modules/tree-sitter-clojure": {
"version": "0.0.8",
"resolved": "git+ssh://git@github.com/sogaiu/tree-sitter-clojure.git#95c7959c461406381b42113dcf4591008c663d21",
"integrity": "sha512-2xqcFlQ/TC+M0mx8jIkKYMnMd5rR0nkMDSEZLpILMuPHH1KFWc7tK4Wof2O7TYhZ3bibSR7htZ+XAINew+9JGQ==",
"resolved": "git+ssh://git@github.com/theHamsta/tree-sitter-clojure-1.git#95c7959c461406381b42113dcf4591008c663d21",
"integrity": "sha512-h8iD1D2l7Qfrktam6y2KAU5K2SRI4lGHL2NCbJG9bmqiY8yTylkK6iJCwkoGLYapjVgxWUDAgaR9tRW5k3q1+g==",
"dependencies": {
"nan": "2.14.2",
"web-tree-sitter": "0.19.1"
}
},
"node_modules/tree-sitter-clojure/node_modules/nan": {
"version": "2.14.2",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
},
"node_modules/web-tree-sitter": {
"version": "0.19.1",
"resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.19.1.tgz",
@ -47,23 +53,30 @@
},
"dependencies": {
"nan": {
"version": "2.14.2",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
"version": "2.15.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
"integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
},
"tree-sitter-cli": {
"version": "0.19.4",
"resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.19.4.tgz",
"integrity": "sha512-p2kxjuoQeauXBu5eE+j7c5BMCRXmc17EiAswnnWn3ieUlHXBkA0Z7vRnaCSElDR34MhZnSgqgzuuzQk0cDqCjw==",
"version": "0.19.5",
"resolved": "https://registry.npmjs.org/tree-sitter-cli/-/tree-sitter-cli-0.19.5.tgz",
"integrity": "sha512-kRzKrUAwpDN9AjA3b0tPBwT1hd8N2oQvvvHup2OEsX6mdsSMLmAvR+NSqK9fe05JrRbVvG8mbteNUQsxlMQohQ==",
"dev": true
},
"tree-sitter-clojure": {
"version": "git+ssh://git@github.com/sogaiu/tree-sitter-clojure.git#95c7959c461406381b42113dcf4591008c663d21",
"integrity": "sha512-2xqcFlQ/TC+M0mx8jIkKYMnMd5rR0nkMDSEZLpILMuPHH1KFWc7tK4Wof2O7TYhZ3bibSR7htZ+XAINew+9JGQ==",
"from": "tree-sitter-clojure@git://github.com:sogaiu/tree-sitter-clojure.git#95c7959c461406381b42113dcf4591008c663d21",
"version": "git+ssh://git@github.com/theHamsta/tree-sitter-clojure-1.git#95c7959c461406381b42113dcf4591008c663d21",
"integrity": "sha512-h8iD1D2l7Qfrktam6y2KAU5K2SRI4lGHL2NCbJG9bmqiY8yTylkK6iJCwkoGLYapjVgxWUDAgaR9tRW5k3q1+g==",
"from": "tree-sitter-clojure@git@github.com:theHamsta/tree-sitter-clojure-1.git#95c7959c461406381b42113dcf4591008c663d21",
"requires": {
"nan": "2.14.2",
"web-tree-sitter": "0.19.1"
},
"dependencies": {
"nan": {
"version": "2.14.2",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
}
}
},
"web-tree-sitter": {

2
package.json
Unescape Escape View File

@ -10,7 +10,7 @@
"license": "GPL-3.0-or-later",
"dependencies": {
"nan": "^2.14.2",
"tree-sitter-clojure": "git://github.com:sogaiu/tree-sitter-clojure.git#95c7959c461406381b42113dcf4591008c663d21"
"tree-sitter-clojure": "git@github.com:theHamsta/tree-sitter-clojure-1.git#95c7959c461406381b42113dcf4591008c663d21"
},
"repository": {
"type": "git",

45
src/grammar.json
Unescape Escape View File

@ -807,7 +807,7 @@
"members": [
{
"type": "PATTERN",
"value": "[^:\\f\\n\\r\\t ()\\[\\]{}\"@^;`\\\\,#'\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
"value": "[^:\\f\\n\\r\\t ()\\[\\]{}\"^;`\\\\,#'\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
},
{
"type": "REPEAT",
@ -816,7 +816,7 @@
"members": [
{
"type": "PATTERN",
"value": "[^:\\f\\n\\r\\t ()\\[\\]{}\"@^;`\\\\,#'\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
"value": "[^:\\f\\n\\r\\t ()\\[\\]{}\"^;`\\\\,#'\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
},
{
"type": "PATTERN",
@ -1645,39 +1645,8 @@
]
},
"derefing_lit": {
"type": "SEQ",
"members": [
{
"type": "REPEAT",
"content": {
"type": "SYMBOL",
"name": "_metadata_lit"
}
},
{
"type": "FIELD",
"name": "marker",
"content": {
"type": "STRING",
"value": "@"
}
},
{
"type": "REPEAT",
"content": {
"type": "SYMBOL",
"name": "_gap"
}
},
{
"type": "FIELD",
"name": "value",
"content": {
"type": "SYMBOL",
"name": "_form"
}
}
]
"type": "SYMBOL",
"name": "complex_num_lit"
},
"quoting_lit": {
"type": "SEQ",
@ -4131,7 +4100,7 @@
"type": "REPEAT1",
"content": {
"type": "PATTERN",
"value": "[^:\\f\\n\\r\\t ()\\[\\]{}\"@^;/`\\\\,#'\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
"value": "[^:\\f\\n\\r\\t ()\\[\\]{}\"^;/`\\\\,#'\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
}
},
"named": true,
@ -4147,7 +4116,7 @@
"members": [
{
"type": "PATTERN",
"value": "[^:\\f\\n\\r\\t ()\\[\\]{}\"@^;`\\\\,#'\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
"value": "[^:\\f\\n\\r\\t ()\\[\\]{}\"^;`\\\\,#'\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
},
{
"type": "REPEAT",
@ -4156,7 +4125,7 @@
"members": [
{
"type": "PATTERN",
"value": "[^:\\f\\n\\r\\t ()\\[\\]{}\"@^;`\\\\,#'\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
"value": "[^:\\f\\n\\r\\t ()\\[\\]{}\"^;`\\\\,#'\\u000B\\u001C\\u001D\\u001E\\u001F\\u2028\\u2029\\u1680\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2008\\u2009\\u200a\\u205f\\u3000]"
},
{
"type": "PATTERN",

475
src/parser.c
View File

File diff suppressed because it is too large Load Diff

4
src/tree_sitter/parser.h
Unescape Escape View File

@ -102,8 +102,8 @@ struct TSLanguage {
const uint16_t *small_parse_table;
const uint32_t *small_parse_table_map;
const TSParseActionEntry *parse_actions;
const char **symbol_names;
const char **field_names;
const char * const *symbol_names;
const char * const *field_names;
const TSFieldMapSlice *field_map_slices;
const TSFieldMapEntry *field_map_entries;
const TSSymbolMetadata *symbol_metadata;

34
test/corpus/basic.txt
Unescape Escape View File

@ -1075,3 +1075,37 @@ Self-references
(kwd_lit
(kwd_symbol))
(sym_lit))))))
================================================================================
@ in defun identifiers
================================================================================
;; this highlights properly
(defun foo (bar)
(baz))
;; this doesn't and breaks all highlighting below
(defun @foo (bar)
(baz))
--------------------------------------------------------------------------------
(source
(comment)
(list_lit
(defun
(defun_header
(defun_keyword)
(sym_lit)
(list_lit
(sym_lit)))
(list_lit
(sym_lit))))
(comment)
(list_lit
(defun
(defun_header
(defun_keyword)
(sym_lit)
(list_lit
(sym_lit)))
(list_lit
(sym_lit)))))