minor code clean up

concordion · Nov 21, 2015 · bba1cac · bba1cac
1 parent 0cf851e
commit bba1cac
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/resources/fileTemplates/ConcordionSpec.html.ft b/resources/fileTemplates/ConcordionSpec.html.ft
@@ -1,4 +1,4 @@
-<html xmlns:concordion="http://www.concordion.org/2007/concordion">
+<html xmlns:c="http://www.concordion.org/2007/concordion">
 <head>
     <title>${NAME}</title>
 </head>

diff --git a/src/org/concordion/internal/MultiPattern.java b/src/org/concordion/internal/MultiPattern.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
+//This class is copied from concordion library so that I do not need to make 1mb dependency on concordion for it
 public class MultiPattern {
 
     private final List<Pattern> patterns;

diff --git a/src/org/concordion/internal/SimpleEvaluator.java b/src/org/concordion/internal/SimpleEvaluator.java
@@ -1,6 +1,6 @@
 package org.concordion.internal;
 
-//This class is copied from concordion library so that I do not need to make 1mb dependency on it
+//This class is copied from concordion library so that I do not need to make 1mb dependency on concordion for it
 public class SimpleEvaluator {
 
     private static final String METHOD_NAME_PATTERN = "[a-z][a-zA-Z0-9_]*";

diff --git a/...dion/plugin/idea/CompleteInformation.java → ...dea/autocomplete/CompleteInformation.java b/...dion/plugin/idea/CompleteInformation.java → ...dea/autocomplete/CompleteInformation.java
@@ -1,4 +1,4 @@
-package org.concordion.plugin.idea;
+package org.concordion.plugin.idea.autocomplete;
 
 import com.intellij.codeInsight.completion.JavaLookupElementBuilder;
 import com.intellij.codeInsight.completion.util.MethodParenthesesHandler;
@@ -7,6 +7,8 @@
 import com.intellij.icons.AllIcons;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.*;
+import org.concordion.plugin.idea.ConcordionPsiUtils;
+import org.concordion.plugin.idea.ConcordionVariableUsage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/src/org/concordion/plugin/idea/autocomplete/ConcordionCommandsCompletionContributor.java b/src/org/concordion/plugin/idea/autocomplete/ConcordionCommandsCompletionContributor.java
@@ -9,6 +9,7 @@
 import com.intellij.util.ProcessingContext;
 import org.concordion.plugin.idea.ConcordionElementPattern;
 import org.concordion.plugin.idea.Namespaces;
+import org.concordion.plugin.idea.lang.ConcordionIcons;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
@@ -96,7 +97,7 @@ private static Iterable<LookupElement> forCommands(Namespaces namespace, String
 
         return commands.stream()
                 .map(c -> prefix + ':' + c)
-                .map(c -> LookupElementBuilder.create(c).withInsertHandler(handler))
+                .map(c -> LookupElementBuilder.create(c).withInsertHandler(handler).withIcon(ConcordionIcons.ICON))
                 .collect(toList());
     }
 }
diff --git a/src/org/concordion/plugin/idea/autocomplete/ConcordionExpressionCompletionContributor.java b/src/org/concordion/plugin/idea/autocomplete/ConcordionExpressionCompletionContributor.java
@@ -10,7 +10,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import static com.intellij.patterns.PlatformPatterns.*;
-import static org.concordion.plugin.idea.CompleteInformation.*;
+import static org.concordion.plugin.idea.autocomplete.CompleteInformation.*;
 import static org.concordion.plugin.idea.ConcordionElementPattern.*;
 
 public class ConcordionExpressionCompletionContributor extends CompletionContributor {