azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust PSI usages to new labels syntax

Browse Source
This commit is contained in:
Denis Zharkov
2015-04-27 12:58:04 +03:00
parent 241860d510
commit 89c72d9400
6 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlighter.java
+2 -2
View File
@@ -52,14 +52,14 @@ public class JetHighlighter extends SyntaxHighlighterBase {
fillMap(keys1, JetTokens.KEYWORDS, JetHighlightingColors.KEYWORD);
keys1.put(JetTokens.AS_SAFE, JetHighlightingColors.KEYWORD);
keys1.put(JetTokens.LABEL_IDENTIFIER, JetHighlightingColors.LABEL);
keys1.put(JetTokens.AT, JetHighlightingColors.LABEL);
keys1.put(JetTokens.INTEGER_LITERAL, JetHighlightingColors.NUMBER);
keys1.put(JetTokens.FLOAT_LITERAL, JetHighlightingColors.NUMBER);
fillMap(keys1,
TokenSet.andNot(JetTokens.OPERATIONS,
TokenSet.orSet(
TokenSet.create(JetTokens.IDENTIFIER, JetTokens.LABEL_IDENTIFIER),
TokenSet.create(JetTokens.IDENTIFIER, JetTokens.AT),
JetTokens.KEYWORDS)),
JetHighlightingColors.OPERATOR_SIGN);
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt
-1
View File
@@ -87,7 +87,6 @@ public class JetSimpleNameReference(
val psiFactory = JetPsiFactory(expression)
val element = when (expression.getReferencedNameElementType()) {
JetTokens.FIELD_IDENTIFIER -> psiFactory.createFieldIdentifier(newElementName)
JetTokens.LABEL_IDENTIFIER -> psiFactory.createClassLabel(newElementName)
else -> {
val extensions = Extensions.getArea(expression.getProject()).getExtensionPoint(
SimpleNameReferenceExtension.EP_NAME).getExtensions()
idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java
+1 -1
View File
@@ -154,7 +154,7 @@ public class KotlinTypedHandler extends TypedHandlerDelegate {
PsiElement lastElement = file.findElementAt(offset - 1);
if (lastElement == null) return false;
return lastElement.getNode().getElementType() == JetTokens.LABEL_IDENTIFIER;
return lastElement.getNode().getElementType() == JetTokens.AT;
}
});
}