Skip to content

fix(udl scanner): lex Language = python bodies with string awareness #50

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.

Sign up for GitHub

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

Closed
isc-tdyar wants to merge 1 commit into from
Closed

fix(udl scanner): lex Language = python bodies with string awareness #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions bindings/python/tree_sitter_objectscript/queries/injections.scm
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions bindings/python/tree_sitter_objectscript_udl/queries/injections.scm
View file
Open in desktop

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

24 changes: 23 additions & 1 deletion common/keywords.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,24 @@ module.exports = {
specialKeywords($.method_keyword, $.method_keyword_codemode_expression),
_external_method_keywords: ($) =>
specialKeywords($.method_keyword, $.method_keyword_external_language),
// Same shape as _external_method_keywords, but restricted to
// Language = python so the body can be lexed by a Python-aware scanner
// token instead of the language-agnostic brace counter.
_python_method_keywords: ($) =>
specialKeywords(
$.method_keyword,
alias(
$.method_keyword_python_language,
$.method_keyword_external_language,
),
),
_call_method_keywords: ($) =>
specialKeywords($.method_keyword, $.call_method_keyword),
call_method_keyword: ($) => seq(/CodeMode/i, '=', alias(/call/i, $.typename)),
method_keyword_external_language: ($) =>
seq(/Language/i, '=', alias(/(?:python|tsql|ispl)/i, $.typename)),
seq(/Language/i, '=', alias(/(?:tsql|ispl)/i, $.typename)),
method_keyword_python_language: ($) =>
seq(/Language/i, '=', alias(/python/i, $.typename)),
// regular method keywords
_keyword_client_name: ($) =>
seq(/ClientName/i, '=', alias(/[^\s'`,\[\]\(\)\{\}]+/, $.property_name)),
Expand Down Expand Up @@ -254,6 +267,15 @@ module.exports = {
_trigger_keywords: ($) => buildKeywords($.trigger_keyword),
_external_trigger_keywords: ($) =>
specialKeywords($.trigger_keyword, $.method_keyword_external_language),
// Trigger counterpart of _python_method_keywords.
_python_trigger_keywords: ($) =>
specialKeywords(
$.trigger_keyword,
alias(
$.method_keyword_python_language,
$.method_keyword_external_language,
),
),

/*
PROPERTY KEYWORDS
Expand Down
4 changes: 2 additions & 2 deletions objectscript/queries/injections.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
(method_definition
(method_keyword_external_language
(typename) @_lang)
(external_method_body_content) @injection.content
(python_method_body_content) @injection.content
(#set! injection.include-children "true")
(#any-of? @_lang "python" "Python" "PYTHON")
(#set! injection.language "python"))
Expand All @@ -53,7 +53,7 @@
(trigger
(method_keyword_external_language
(typename) @_lang)
(external_method_body_content) @injection.content
(python_method_body_content) @injection.content
(#set! injection.include-children "true")
(#any-of? @_lang "python" "Python" "PYTHON")
(#set! injection.language "python"))
Expand Down
Loading
Loading