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

Merge commit '8a13647a4d9ef6548320ca9ee4bf67d28960163e' into hcl

pull/264/head
Xuanwo 2022-04-23 02:06:41 +07:00
parent 5a7ca84455 8a13647a4d
commit d5d2f7169e
No known key found for this signature in database
GPG Key ID: C423B4FA6B48E945
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/tree-sitter-hcl/.github/workflows/build.yaml vendored
Unescape Escape View File

@ -19,4 +19,4 @@ jobs:
uses: egor-tensin/setup-mingw@v2 uses: egor-tensin/setup-mingw@v2
- name: build - name: build
run: ${{ matrix.compiler }} -o scanner.o -I./src -c src/scanner.cc run: ${{ matrix.compiler }} -o scanner.o -I./src -c src/scanner.cc -Werror

6
vendor/tree-sitter-hcl/src/scanner.cc vendored
Unescape Escape View File

@ -96,7 +96,7 @@ public:
} }
// manage quoted context // manage quoted context
if (valid_symbols[QUOTED_TEMPLATE_START] && !in_quoted_context() && lexer->lookahead == '"') { if (valid_symbols[QUOTED_TEMPLATE_START] && !in_quoted_context() && lexer->lookahead == '"') {
Context ctx = { QUOTED_TEMPLATE }; Context ctx = { QUOTED_TEMPLATE, "" };
context_stack.push_back(ctx); context_stack.push_back(ctx);
return accept_and_advance(lexer, QUOTED_TEMPLATE_START); return accept_and_advance(lexer, QUOTED_TEMPLATE_START);
} }
@ -114,7 +114,7 @@ public:
) { ) {
advance(lexer); advance(lexer);
if (lexer->lookahead == '{') { if (lexer->lookahead == '{') {
Context ctx = { TEMPLATE_INTERPOLATION }; Context ctx = { TEMPLATE_INTERPOLATION, "" };
context_stack.push_back(ctx); context_stack.push_back(ctx);
return accept_and_advance(lexer, TEMPLATE_INTERPOLATION_START); return accept_and_advance(lexer, TEMPLATE_INTERPOLATION_START);
} }
@ -142,7 +142,7 @@ public:
) { ) {
advance(lexer); advance(lexer);
if (lexer->lookahead == '{') { if (lexer->lookahead == '{') {
Context ctx = { TEMPLATE_DIRECTIVE }; Context ctx = { TEMPLATE_DIRECTIVE, "" };
context_stack.push_back(ctx); context_stack.push_back(ctx);
return accept_and_advance(lexer, TEMPLATE_DIRECTIVE_START); return accept_and_advance(lexer, TEMPLATE_DIRECTIVE_START);
} }