Skip to content

Highlight field expression in types #28

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Highlight field expression in types #28

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
e5e84bb
highlight field expression types
guimarqu Dec 20, 2024
f67a6dd
improve
guimarqu Dec 21, 2024
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
124 changes: 117 additions & 7 deletions languages/julia/highlights.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,89 @@
; Type annotations
(parametrized_type_expression
[
(identifier) @type
(field_expression
(identifier) @type .)
((identifier) @type) ; match T
(field_expression
(identifier) @module
(identifier) @type
) ; match MyModule.T
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @type) ; match MyModule.MySubModule.T
(field_expression
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @module)
(identifier) @type) ; match MyModule.MySubmodule.MySubSubModule.T)
]
(curly_expression
(_) @type))
[
((identifier) @type) ; match T
(_) @type
(field_expression
(identifier) @module
(identifier) @type
) ; match MyModule.T
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @type) ; match MyModule.MySubModule.T
(field_expression
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @module)
(identifier) @type) ; match MyModule.MySubmodule.MySubSubModule.T
(unary_expression
(operator) @operator
[
((identifier) @type) ; match T
(field_expression
(identifier) @module
(identifier) @type
) ; match MyModule.T
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @type) ; match MyModule.MySubModule.T
(field_expression
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @module)
(identifier) @type) ; match MyModule.MySubmodule.MySubSubModule.T
] (#any-of? @operator "<:" ">:"))
]
)) ; Zed - change to capture types prefixed with module names.

(typed_expression
(identifier) @type .)
(identifier)
[
((identifier) @type) ; match T
(field_expression
(identifier) @module
(identifier) @type
) ; match MyModule.T
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @type) ; match MyModule.MySubModule.T
(field_expression
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @module)
(identifier) @type) ; match MyModule.MySubmodule.MySubSubModule.T
]) ; Zed - change to capture types prefixed with module names.

(unary_typed_expression
(identifier) @type .)
Expand All @@ -85,9 +159,45 @@
(_) @type .)

(binary_expression
(_) @type
[
((identifier) @type) ; match T
(field_expression
(identifier) @module
(identifier) @type
) ; match MyModule.T
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @type) ; match MyModule.MySubModule.T
(field_expression
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @module)
(identifier) @type) ; match MyModule.MySubmodule.MySubSubModule.T
]
(operator) @operator
(_) @type
[
((identifier) @type) ; match T
(field_expression
(identifier) @module
(identifier) @type
) ; match MyModule.T
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @type) ; match MyModule.MySubModule.T
(field_expression
(field_expression
(field_expression
(identifier) @module
(identifier) @module)
(identifier) @module)
(identifier) @type) ; match MyModule.MySubmodule.MySubSubModule.T
]
(#any-of? @operator "<:" ">:"))

; Built-in types
Expand Down
28 changes: 27 additions & 1 deletion syntax-test-cases/edge-cases.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ begin
# this is a block, not an index
end

# ------------
# ------------
# Zed specials
# ------------

Expand All @@ -34,6 +34,32 @@ function foo end
function foo(x) 2x end
function Base.foo(x) 2x end

# Types
struct Bar
a::T
b::MyModule.T # pass
c::MyModule.MySubModule.T # pass
d::MyModule.MySubModule.MySubSubModule.T # pass
d::MyModule.MySubModule.MySubSubModule.MySubSubSubModule.T # broken
e::MyModule.MySubModule.T{Int} # pass
f::MyModule.MySubModule.T{MyModule.Int} # pass
g::MyModule.MySubModule.T{MyModule.MySubModule.Int} # pass
h::MyModule.MySubModule.MySubSubModule.T{MyModule.MySubModule.MySubSubModule.Int} # pass
i::Array{<:MyModule.MySubModule.T} # pass
j::Array{>:MyModule.MySubModule.T} # pass
k::Tuple{MyModule.MySubModule.T,MyModule.MySubModule.U} # pass
end

function bar(w::T) end
function bar(x::MyModule.T, y::MyModule.T) nothing end
function bar(y::MyModule.MySubmodule.T) nothing end
function bar(z::MyModule.MySubmodule.T{MyModule.MySubModule.Int}) nothing end
function bar(z::T) where {T<:MyModule.MySubModule.MySubSubModule.U} nothing end
function bar(z::T) where {T>:MyModule.MySubModule.MySubSubModule.U} nothing end

bar(z::MyModule.MySubmodule.T{MyModule.MySubModule.Int}) where {T<:MyModule.MySubModule.MySubSubModule.U} = nothing
Base.bar(z::MyModule.MySubmodule.T{MyModule.MySubModule.Int}) where {T<:MyModule.MySubModule.MySubSubModule.U} = nothing

# Short function definitions
# (highlight the function name as @function.definition
# and the equal sign as @keyword.function)
Expand Down