|
37 | 37 | import de.halirutan.mathematica.parsing.psi.MathematicaRecursiveVisitor; |
38 | 38 | import de.halirutan.mathematica.parsing.psi.MathematicaVisitor; |
39 | 39 | import de.halirutan.mathematica.parsing.psi.api.MessageName; |
40 | | -import de.halirutan.mathematica.parsing.psi.api.slots.Slot; |
41 | 40 | import de.halirutan.mathematica.parsing.psi.api.StringifiedSymbol; |
42 | 41 | import de.halirutan.mathematica.parsing.psi.api.Symbol; |
43 | 42 | import de.halirutan.mathematica.parsing.psi.api.function.Function; |
| 43 | +import de.halirutan.mathematica.parsing.psi.api.slots.Slot; |
44 | 44 | import de.halirutan.mathematica.parsing.psi.api.slots.SlotExpression; |
45 | 45 | import de.halirutan.mathematica.parsing.psi.util.LocalDefinitionResolveProcessor; |
46 | | -import de.halirutan.mathematica.parsing.psi.util.LocalizationConstruct; |
| 46 | +import de.halirutan.mathematica.parsing.psi.util.LocalizationConstruct.ConstructType; |
47 | 47 | import org.jetbrains.annotations.NotNull; |
48 | 48 |
|
49 | 49 | import java.util.Set; |
@@ -86,17 +86,15 @@ public void annotate(@NotNull PsiElement element, @NotNull final AnnotationHolde |
86 | 86 |
|
87 | 87 | @Override |
88 | 88 | public void visitSymbol(final Symbol symbol) { |
89 | | - PsiElement id = symbol.getFirstChild(); |
90 | | - |
91 | | - if (NAMES.contains(id.getText())) { |
| 89 | + if (NAMES.contains(symbol.getMathematicaContext()+symbol.getSymbolName())) { |
92 | 90 | setHighlighting(symbol, myHolder, MathematicaSyntaxHighlighterColors.BUILTIN_FUNCTION); |
93 | 91 | return; |
94 | 92 | } |
95 | 93 |
|
96 | 94 | LocalDefinitionResolveProcessor processor = new LocalDefinitionResolveProcessor(symbol); |
97 | 95 | PsiTreeUtil.treeWalkUp(processor, symbol, symbol.getContainingFile(), ResolveState.initial()); |
98 | 96 |
|
99 | | - final LocalizationConstruct.ConstructType scope = processor.getMyLocalization(); |
| 97 | + final ConstructType scope = processor.getMyLocalization(); |
100 | 98 | switch (scope) { |
101 | 99 | case NULL: |
102 | 100 | break; |
|
0 commit comments