up value

EmmyLua · Feb 16, 2017 · 8df1c8a · 8df1c8a
1 parent 6aeff95
commit 8df1c8a
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 1 deletion.
diff --git a/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.java b/src/main/java/com/tang/intellij/lua/annotator/LuaAnnotator.java
@@ -109,6 +109,14 @@ public void visitNameRef(@NotNull LuaNameRef o) {
             if (id.getNode().getElementType() == LuaTypes.SELF)
                 return;
 
+            //up value
+            PsiElement upvalue = LuaPsiResolveUtil.resolveUpvalue(o, new SearchContext(o.getProject()));
+            if (upvalue != null) {
+                Annotation annotation = myHolder.createInfoAnnotation(o, null);
+                annotation.setTextAttributes(LuaHighlightingData.UP_VALUE);
+                return;
+            }
+
             PsiElement res = o.resolve(new SearchContext(o.getProject()));
             if (res instanceof LuaParamNameDef) {
                 Annotation annotation = myHolder.createInfoAnnotation(o, null);

diff --git a/src/main/java/com/tang/intellij/lua/editor/LuaColorSettingsPage.java b/src/main/java/com/tang/intellij/lua/editor/LuaColorSettingsPage.java
@@ -52,7 +52,8 @@ public class LuaColorSettingsPage implements ColorSettingsPage {
             new AttributesDescriptor("Local Variables", LuaHighlightingData.LOCAL_VAR),
             new AttributesDescriptor("Global Variables", LuaHighlightingData.GLOBAL_VAR),
             new AttributesDescriptor("Global Functions", LuaHighlightingData.GLOBAL_FUNCTION),
-            new AttributesDescriptor("Table Fields", LuaHighlightingData.TABLE_FIELD)
+            new AttributesDescriptor("Table Fields", LuaHighlightingData.TABLE_FIELD),
+            new AttributesDescriptor("Up Value", LuaHighlightingData.UP_VALUE),
     };
 
     @NonNls

diff --git a/src/main/java/com/tang/intellij/lua/highlighting/LuaHighlightingData.java b/src/main/java/com/tang/intellij/lua/highlighting/LuaHighlightingData.java
@@ -64,6 +64,8 @@ public class LuaHighlightingData {
     private static final String LUADOC_TAG_ID = "LUA_LUADOC_TAG";
     @NonNls
     private static final String LUADOC_VALUE_ID = "LUA_LUADOC_VALUE";
+    @NonNls
+    private static final String UP_VALUE_ID = "LUA_UP_VALUE";
 
     public static TextAttributesKey DOC_COMMENT_TAG =
             TextAttributesKey.createTextAttributesKey(LUADOC_TAG_ID, DefaultLanguageHighlighterColors.DOC_COMMENT_TAG);
@@ -103,4 +105,6 @@ public class LuaHighlightingData {
             TextAttributesKey.createTextAttributesKey(OPERATORS_ID, DefaultLanguageHighlighterColors.OPERATION_SIGN);
     public static final TextAttributesKey PRIMITIVE_TYPE =
             TextAttributesKey.createTextAttributesKey("LUA_PRIMITIVE_TYPE", ConsoleHighlighter.CYAN_BRIGHT);
+    public static TextAttributesKey UP_VALUE =
+            TextAttributesKey.createTextAttributesKey(UP_VALUE_ID);
 }
diff --git a/src/main/java/com/tang/intellij/lua/psi/LuaPsiResolveUtil.java b/src/main/java/com/tang/intellij/lua/psi/LuaPsiResolveUtil.java
@@ -28,6 +28,7 @@
 import com.tang.intellij.lua.stubs.index.LuaGlobalFuncIndex;
 import com.tang.intellij.lua.stubs.index.LuaGlobalVarIndex;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -102,6 +103,25 @@ public static PsiElement resolveLocal(LuaNameRef ref, SearchContext context) {
         return result;
     }
 
+    @Nullable
+    public static PsiElement resolveUpvalue(@NotNull LuaNameRef ref, @NotNull SearchContext context) {
+        String refName = ref.getName();
+        if (refName.equals(Constants.WORD_SELF))
+            return null;
+
+        LuaFuncBody funcBody = PsiTreeUtil.getParentOfType(ref, LuaFuncBody.class);
+        if (funcBody == null)
+            return null;
+
+        PsiElement resolve = resolveLocal(ref, context);
+        if (resolve != null) {
+            if (!funcBody.getTextRange().contains(resolve.getTextRange()))
+                return resolve;
+        }
+
+        return null;
+    }
+
     private static PsiElement resolveResult;
 
     /**

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -89,8 +89,12 @@
         <typedHandler implementation="com.tang.intellij.lua.editor.LuaAutoPopupHandler"/>
         <typedHandler implementation="com.tang.intellij.lua.editor.LuaAutoIndentHandler"/>
 
+        <!-- color -->
         <colorSettingsPage implementation="com.tang.intellij.lua.editor.LuaColorSettingsPage"/>
+        <additionalTextAttributes scheme="Default" file="colorSchemes/Default.xml"/>
+        <additionalTextAttributes scheme="Darcula" file="colorSchemes/Darcula.xml"/>
 
+        <!-- debugger -->
         <programRunner implementation="com.tang.intellij.lua.debugger.LuaDebuggerRunner"/>
         <configurationType implementation="com.tang.intellij.lua.debugger.LuaConfigurationType"/>
         <xdebugger.breakpointType implementation="com.tang.intellij.lua.debugger.LuaLineBreakpointType"/>

diff --git a/src/main/resources/colorSchemes/Darcula.xml b/src/main/resources/colorSchemes/Darcula.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+<list>
+    <option name="LUA_UP_VALUE">
+        <value>
+            <option name="FOREGROUND" value="A8C023"/>
+            <option name="FONT_TYPE" value="3"/>
+            <option name="EFFECT_COLOR" value="A8C023"/>
+            <option name="EFFECT_TYPE" value="1"/>
+        </value>
+    </option>
+</list>
diff --git a/src/main/resources/colorSchemes/Default.xml b/src/main/resources/colorSchemes/Default.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0'?>
+<list>
+    <option name="LUA_UP_VALUE">
+        <value>
+            <option name="FOREGROUND" value="50505"/>
+            <option name="FONT_TYPE" value="3"/>
+            <option name="EFFECT_COLOR" value="50505"/>
+            <option name="EFFECT_TYPE" value="1"/>
+        </value>
+    </option>
+</list>