Update highlighter

Author: ice1000

README.md

@@ -1,9 +1,7 @@
-# plugin-template
+# Solidity for DevKt
 
-This is the template of the plugin project.
-
-Things to change before coding:
-
-+ `your-language-devkt` in [settings.gradle.kts](settings.gradle.kts)
-+ `your.package.name` in [build.gradle.kts](build.gradle.kts)
+This is a [DevKt][0] plugin for the Solidity programming language, based on
+[this IDEA plugin][1].
 
+  [0]: https://github.com/ice1000/dev-kt
+  [1]: https://github.com/intellij-solidity/intellij-solidity

lib/common-v1.4-SNAPSHOT.jar

@@ -8,9 +8,11 @@
 import org.ice1000.devkt.openapi.AnnotationHolder;
 import org.ice1000.devkt.openapi.ColorScheme;
 import org.ice1000.devkt.openapi.ExtendedDevKtLanguage;
+import org.ice1000.devkt.openapi.PsiUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.com.intellij.psi.PsiElement;
+import org.jetbrains.kotlin.com.intellij.psi.TokenType;
 import org.jetbrains.kotlin.com.intellij.psi.tree.IElementType;
 
 public class Solidity<T> extends ExtendedDevKtLanguage<T> {
@@ -45,13 +47,27 @@ public T attributesOf(IElementType type, ColorScheme<? extends T> colorScheme) {
 	@Override
 	public void annotate(PsiElement element, AnnotationHolder<? super T> document, ColorScheme<? extends T> colorScheme) {
 		super.annotate(element, document, colorScheme);
-		if (element instanceof SolNumberLiteral) document.highlight(element, colorScheme.getNumbers());
-		else {
+		if (element instanceof SolNumberLiteral) {
+			document.highlight(element, colorScheme.getNumbers());
+			return;
+		}
+		function:
+		{
 			PsiElement prevSibling = element.getPrevSibling();
-			if (prevSibling == null) return;
-			if (prevSibling.getNode().getElementType() == SolidityTokenTypes.FUNCTION) {
+			if (prevSibling == null) break function;
+			if (PsiUtils.getNodeType(prevSibling) == TokenType.WHITE_SPACE) prevSibling = prevSibling.getPrevSibling();
+			if (prevSibling == null) break function;
+			if (PsiUtils.getNodeType(prevSibling) == SolidityTokenTypes.FUNCTION)
 				document.highlight(element, colorScheme.getFunction());
-			}
+		}
+		clazz:
+		{
+			PsiElement prevSibling = element.getPrevSibling();
+			if (prevSibling == null) break clazz;
+			if (PsiUtils.getNodeType(prevSibling) == TokenType.WHITE_SPACE) prevSibling = prevSibling.getPrevSibling();
+			if (prevSibling == null) break clazz;
+			if (PsiUtils.getNodeType(prevSibling) == SolidityTokenTypes.CONTRACT)
+				document.highlight(element, colorScheme.getNamespace());
 		}
 	}
 

src/me/serce/devkt/solidity/lang/Solidity.java

@@ -15,7 +15,7 @@ public SolElementType(@NotNull String debugName) {
 	public static final @NotNull
 	TokenSet COMMENTS = TokenSet.create(LINECOMMENT, DOCCOMMENT);
 	public static final @NotNull
-	TokenSet NUMBERS = TokenSet.create(HEXNUMBER, DECIMALNUMBER, FIXEDNUMBER, SCIENTIFICNUMBER, NUMBERUNIT);
+	TokenSet NUMBERS = TokenSet.create(HEXNUMBER, DECIMALNUMBER, FIXEDNUMBER, SCIENTIFICNUMBER, NUMBERUNIT, HEXLITERAL);
 	public static final @NotNull
 	TokenSet KEYWORDS = TokenSet.create(IMPORT,
 			AS,