Skip to content

Commit 9b72441

Browse files
committed
Hot fix. The reworked function name provider broke the highlighting of built-in symbols because names contain now the full context. The logic inside MathematicaHighlightingAnnotator.java needs a second look!
1 parent b437d6a commit 9b72441

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

.idea/codeStyleSettings.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/de/halirutan/mathematica/codeinsight/highlighting/MathematicaHighlightingAnnotator.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
import de.halirutan.mathematica.parsing.psi.MathematicaRecursiveVisitor;
3838
import de.halirutan.mathematica.parsing.psi.MathematicaVisitor;
3939
import de.halirutan.mathematica.parsing.psi.api.MessageName;
40-
import de.halirutan.mathematica.parsing.psi.api.slots.Slot;
4140
import de.halirutan.mathematica.parsing.psi.api.StringifiedSymbol;
4241
import de.halirutan.mathematica.parsing.psi.api.Symbol;
4342
import de.halirutan.mathematica.parsing.psi.api.function.Function;
43+
import de.halirutan.mathematica.parsing.psi.api.slots.Slot;
4444
import de.halirutan.mathematica.parsing.psi.api.slots.SlotExpression;
4545
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;
4747
import org.jetbrains.annotations.NotNull;
4848

4949
import java.util.Set;
@@ -86,17 +86,15 @@ public void annotate(@NotNull PsiElement element, @NotNull final AnnotationHolde
8686

8787
@Override
8888
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())) {
9290
setHighlighting(symbol, myHolder, MathematicaSyntaxHighlighterColors.BUILTIN_FUNCTION);
9391
return;
9492
}
9593

9694
LocalDefinitionResolveProcessor processor = new LocalDefinitionResolveProcessor(symbol);
9795
PsiTreeUtil.treeWalkUp(processor, symbol, symbol.getContainingFile(), ResolveState.initial());
9896

99-
final LocalizationConstruct.ConstructType scope = processor.getMyLocalization();
97+
final ConstructType scope = processor.getMyLocalization();
10098
switch (scope) {
10199
case NULL:
102100
break;

0 commit comments

Comments
 (0)