Skip to content

V1.9.13 updates - Differentiate identifiers by context #48

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

Merged
hkimura-intersys merged 2 commits into from
Jul 18, 2026
Merged

V1.9.13 updates - Differentiate identifiers by context #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35a2e4c
feat: remove direct objectscript_identifier queries
hkimura-intersys Jul 16, 2026
d62dbb9
fix: update python query bindings
hkimura-intersys Jul 16, 2026
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop

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

15 changes: 12 additions & 3 deletions bindings/python/tree_sitter_objectscript/queries/highlights.scm
View file
Open in desktop

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

15 changes: 12 additions & 3 deletions bindings/python/tree_sitter_objectscript_core/queries/highlights.scm
View file
Open in desktop

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

15 changes: 12 additions & 3 deletions bindings/python/tree_sitter_objectscript_expr/queries/highlights.scm
View file
Open in desktop

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

15 changes: 12 additions & 3 deletions bindings/python/tree_sitter_objectscript_routine/queries/highlights.scm
View file
Open in desktop

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

15 changes: 12 additions & 3 deletions bindings/python/tree_sitter_objectscript_udl/queries/highlights.scm
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion bindings/rust-playground/Cargo.toml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion bindings/rust-routine/Cargo.toml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion common/common.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ $(error Windows is not supported)
endif

HOMEPAGE_URL := https://github.com/intersystems/tree-sitter-objectscript
VERSION := 1.9.12
VERSION := 1.9.13

# repository
SRC_DIR := src
Expand Down
68 changes: 24 additions & 44 deletions common/keywords.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ function specialKeywords(rule, requiredRule) {
}

/**
*
* @param {GrammarSymbols<string>} $
* @param {RuleOrLiteral} keyword
*/
function buildBoolKeywordArg(keyword) {
return seq(keyword, '=', /[0-1]/);
function buildBoolKeywordArg($, keyword) {
return seq(keyword, '=', alias(/[0-1]/, $.numeric_literal));
}

/**
Expand All @@ -34,7 +34,7 @@ function buildKeywords(keyword) {
return seq('[', commaSep(keyword), ']');
}

const {commaSep1, commaSep} = require('../common/define_grammar');
const {commaSep1, commaSep, build_arguments} = require('../common/define_grammar');

// Keyword rules
module.exports = {
Expand Down Expand Up @@ -67,7 +67,7 @@ module.exports = {
seq(
/SoapNameSpace/i,
'=',
choice($.objectscript_identifier, $.string_literal),
choice(alias($._base_variable, $.typename), $.string_literal),
),
_method_keyword_no_arg: ($) =>
seq(
Expand All @@ -82,9 +82,9 @@ module.exports = {
$._keyword_soap_binding_style,
$._keyword_soap_body_use,
$._keyword_soap_namespace,
seq(/PublicList/i, '=', $._objectscript_method_name_or_list),
seq(/(?:GenerateAfter|PlaceAfter)/i, '=', $._method_name_or_list),
seq(/ExternalProcName/i, '=', $.objectscript_identifier),
seq(/PublicList/i, '=', $._method_names),
seq(/(?:GenerateAfter|PlaceAfter)/i, '=', $._method_names),
seq(/ExternalProcName/i, '=', alias($._base_variable, $.typename)),
seq(/CodeMode/i, '=', alias(/(?:objectgenerator|code)/i, $.typename)),
seq(/Language/i, '=', alias(/objectscript/i, $.typename)),
seq(
Expand All @@ -95,7 +95,7 @@ module.exports = {
seq(
/SoapAction/i,
'=',
alias(choice($.string_literal, $.objectscript_identifier), $.typename),
alias(choice($.string_literal, $._base_variable), $.typename),
),
seq(/SoapMessageName/i, '=', $.xml_identifier),
seq(/SoapRequestMessage/i, '=', $.xml_identifier),
Expand All @@ -104,16 +104,8 @@ module.exports = {
method_keyword: ($) =>
choice($._method_keyword_no_arg, $._method_keyword_value),
_method_keywords: ($) => buildKeywords($.method_keyword),
_method_name_or_list: ($) =>
choice(
alias($.identifier, $.method_name),
seq('(', commaSep1(alias($.identifier, $.method_name)), ')'),
),
_objectscript_method_name_or_list: ($) =>
choice(
alias($.objectscript_identifier, $.method_name),
seq('(', commaSep1(alias($.objectscript_identifier, $.method_name)), ')'),
),
_method_names: ($) =>
build_arguments(alias($._quote_permitting_identifier, $.method_name)),
xml_identifier: (_) => /[A-Za-z_][A-Za-z0-9._-]*/,
/*
CLASS KEYWORDS
Expand All @@ -132,13 +124,13 @@ module.exports = {
seq(
/(?:ConstraintClass|ProjectionClass|PropertyClass|CompileAfter|TriggerClass|DependsOn|IndexClass|QueryClass)/i,
'=',
$._class_name_or_list,
build_arguments(alias($._quote_permitting_identifier, $.class_name)),
),
_class_single_class_keyword: ($) =>
seq(
/(?:EmbeddedClass|GeneratedBy|membersuper)/i,
'=',
alias($.identifier, $.class_name),
alias($._quote_permitting_identifier, $.class_name),
),
_class_keyword_value: ($) =>
choice(
Expand Down Expand Up @@ -190,15 +182,10 @@ module.exports = {
$.typename,
),
),
seq(/StorageStrategy/i, '=', alias($.identifier, $.storage_name)),
seq(/StorageStrategy/i, '=', alias($._quote_permitting_identifier, $.storage_name)),
seq(/System/i, '=', alias(/[0-4]/, $.numeric_literal)),
seq(/ViewQuery/i, '=', '{', $.external_method_body_content, '}'),
),
_class_name_or_list: ($) =>
choice(
alias($.identifier, $.class_name),
seq('(', commaSep1(alias($.identifier, $.class_name)), ')'),
),
_class_keywords: ($) => buildKeywords($.class_keyword),
class_keyword: ($) => choice($._class_keyword_no_arg, $._class_keyword_value),

Expand Down Expand Up @@ -283,19 +270,19 @@ module.exports = {
/Aliases/i,
'=',
'{',
commaSep1(alias($.objectscript_identifier, $.property_name)),
commaSep1(alias($._base_variable, $.property_name)),
'}',
),
$._keyword_client_name,
buildBoolKeywordArg(/ComputeLocalOnly/i),
buildBoolKeywordArg($, /ComputeLocalOnly/i),
$.keyword_server_only,
seq(
/InitialExpression/i,
'=',
choice(
seq('{', $.expression, '}'),
alias($.string_literal, $.typename),
alias($.objectscript_identifier, $.typename),
alias($._base_variable, $.typename),
),
),
seq(/SqlColumnNumber/i, '=', $.numeric_literal),
Expand All @@ -310,7 +297,7 @@ module.exports = {
'(',
commaSep1(
choice(
alias($.objectscript_identifier, $.typename),
alias($._base_variable, $.typename),
$.oref_chain_expr,
alias('%%UPDATE', $.typename),
alias('%%INSERT', $.typename),
Expand All @@ -319,7 +306,7 @@ module.exports = {
')',
),
),
alias($.objectscript_identifier, $.typename),
alias($._base_variable, $.typename),
$.oref_chain_expr,
alias('%%UPDATE', $.typename),
alias('%%INSERT', $.typename),
Expand All @@ -333,14 +320,14 @@ module.exports = {
alias(/(?:DELIMITED|SUBNODE|LIST)/i, $.typename),
),
),
keyword_server_only: ($) => buildBoolKeywordArg(/ServerOnly/i),
keyword_server_only: ($) => buildBoolKeywordArg($, /ServerOnly/i),
sql_id: (_) => /[A-Za-z%_][A-Za-z@_#$0-9]*/,
rhs_sql_compute_code: ($) =>
seq(
'{',
/Set/i,
'{',
choice('*', $.objectscript_identifier),
choice('*', $.sql_id),
'}',
'=',
choice(seq('{', $.expression, '}'), $.expression),
Expand Down Expand Up @@ -410,7 +397,7 @@ module.exports = {
seq(
/Constraint/i,
'=',
choice($.string_literal, $.objectscript_identifier),
choice($.string_literal, alias($._base_variable, $.typename)),
),
parameter_keyword: ($) =>
choice(
Expand Down Expand Up @@ -448,18 +435,11 @@ module.exports = {
seq('{', $.expression, '}'),
),
),
seq(/CoshardWith/i, '=', alias($.identifier, $.class_name)),
seq(/CoshardWith/i, '=', alias($._quote_permitting_identifier, $.class_name)),
seq(
/Data/i,
'=',
choice(
alias($._quote_permitting_identifier, $.property_name),
seq(
'(',
commaSep1(alias($._quote_permitting_identifier, $.property_name)),
')',
),
),
build_arguments(alias($._quote_permitting_identifier, $.property_name)),
),
$._keyword_sql_name,
seq(
Expand Down
Loading