Skip to content

Commit 1a0be43

Browse files
committed
[ #280 ] module name
1 parent 958c926 commit 1a0be43

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

grammar/julia-grammar.bnf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ memberAccess ::=
250250
IN_KEYWORD
251251
| UNION_KEYWORD
252252
| opAsSymbol
253+
| (LEFT_BRACKET opAsSymbol RIGHT_BRACKET)
253254
| symbolAndMacroSymbol (DOT_SYM symbolAndMacroSymbol)*{rightAssociative=true}
254255

255256
private access ::= (DOT_SYM | DOUBLE_DOT_SYM | SLICE_SYM)? memberAccess

src/org/ice1000/julia/lang/psi/impl/julia-psi-mixin.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,12 @@ abstract class JuliaSymbolMixin(node: ASTNode) : JuliaAbstractSymbol(node), Juli
293293
parent is JuliaMacro -> JuliaSymbolKind.MacroName
294294

295295
parent is JuliaModuleDeclaration ||
296-
(parent is JuliaMemberAccess &&
297-
this === parent.firstChild &&
298-
parent.parent is JuliaUsing) /*TODO function Base.xxx*/ -> JuliaSymbolKind.ModuleName
296+
(parent is JuliaMemberAccess && this === parent.firstChild &&
297+
parent.parent.let { grandpa ->
298+
(grandpa is JuliaUsing || grandpa is JuliaImportExpr)
299+
&& grandpa.children.firstOrNull { it is JuliaMemberAccess } === parent
300+
})
301+
/*TODO function Base.xxx*/ -> JuliaSymbolKind.ModuleName
299302

300303
parent is JuliaAbstractTypeDeclaration -> JuliaSymbolKind.AbstractTypeName
301304
parent is JuliaPrimitiveTypeDeclaration -> JuliaSymbolKind.PrimitiveTypeName

0 commit comments

Comments
 (0)