Merge branch 'develop'

Author: adrienbaron

.gitignore

@@ -6,6 +6,9 @@ build
 .gradle
 .idea
 *.iml
+gradle/
+gradlew
+gradlew.bat
 
 # IntelliJ
 out/

build.gradle

@@ -8,23 +8,23 @@ buildscript {
         }
         mavenCentral()
     }
-    dependencies {
-        classpath "gradle.plugin.org.jetbrains:gradle-intellij-plugin:0.1.10"
-    }
+}
+
+plugins {
+    id "org.jetbrains.intellij" version "0.3.11"
 }
 
 apply plugin: 'org.jetbrains.intellij'
 
-version = "IU-162.2228.15"
 intellij {
-    version 'IU-162.2228.15'
+    version 'IU-173.4674.33'
     pluginName 'vue-gwt-plugin'
     downloadSources false
     updateSinceUntilBuild false
 }
 
 group 'com.axellience'
-version '0.0.2'
+version '0.1.0'
 
 repositories {
     mavenCentral()

src/main/java/com/axellience/vuegwtplugin/VueGWTBundle.java

@@ -0,0 +1,41 @@
+package com.axellience.vuegwtplugin;
+
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.util.ResourceBundle;
+
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.PropertyKey;
+
+import com.intellij.CommonBundle;
+
+public class VueGWTBundle
+{
+    @NonNls
+    public static final String BUNDLE = "com.axellience.vuegwtplugin.VueGWTBundle";
+
+    private static Reference<ResourceBundle> vueGWTBundle;
+
+    private VueGWTBundle()
+    {
+    }
+
+    public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key,
+                                 @NotNull Object... params)
+    {
+        return CommonBundle.message(getBundle(), key, params);
+    }
+
+    private static ResourceBundle getBundle()
+    {
+        ResourceBundle bundle = com.intellij.reference.SoftReference.dereference(vueGWTBundle);
+
+        if (bundle == null) {
+            bundle = ResourceBundle.getBundle(BUNDLE);
+            vueGWTBundle = new SoftReference<>(bundle);
+        }
+
+        return bundle;
+    }
+}

src/main/java/com/axellience/vuegwtplugin/VueGWTFileWatcher.java

@@ -13,64 +13,82 @@
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-public class VueGWTFileWatcher extends FileDocumentManagerAdapter
-{
-    private static final Logger LOGGER = Logger.getInstance(VueGWTFileWatcher.class);
-    private final Project project;
+public class VueGWTFileWatcher extends FileDocumentManagerAdapter {
 
-    VueGWTFileWatcher(Project project)
-    {
-        this.project = project;
+  private static final Logger LOGGER = Logger.getInstance(VueGWTFileWatcher.class);
+  private final Project project;
+
+  VueGWTFileWatcher(Project project) {
+    this.project = project;
+  }
+
+  @Override
+  public void beforeDocumentSaving(@NotNull Document document) {
+    PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
+    if (psiFile == null) {
+      return;
     }
 
-    @Override
-    public void beforeDocumentSaving(@NotNull Document document)
-    {
-        PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
-        if (psiFile == null)
-            return;
+    processFile(psiFile.getVirtualFile());
+  }
+
+  private void processFile(VirtualFile changedFile) {
+    if ("html".equals(changedFile.getExtension())) {
+      processHtmlFile(changedFile);
+    } else if ("java".equals(changedFile.getExtension())) {
+      processJavaFile(changedFile);
+    }
+  }
 
-        processFile(psiFile.getVirtualFile());
+  private void processHtmlFile(VirtualFile htmlFile) {
+    VirtualFile javaFile = getSibling(htmlFile, htmlFile.getNameWithoutExtension() + ".java");
+    if (javaFile == null) {
+      return;
     }
 
-    private void processFile(VirtualFile changedFile)
-    {
-        if (!"html".equals(changedFile.getExtension()))
-            return;
+    ApplicationManager.getApplication().invokeLater(() -> compileComponent(javaFile, htmlFile));
+  }
+
+  private void processJavaFile(VirtualFile javaFile) {
+    VirtualFile htmlFile = getSibling(javaFile, javaFile.getNameWithoutExtension() + ".html");
+    if (htmlFile == null)
+      return;
 
-        String javaClassFileName = changedFile.getNameWithoutExtension() + ".java";
-        VirtualFile parent = changedFile.getParent();
-        if (parent == null)
-            return;
+    ApplicationManager.getApplication().invokeLater(() -> compileComponent(javaFile, htmlFile));
+  }
 
-        VirtualFile javaFile = parent.findChild(javaClassFileName);
-        if (javaFile == null)
-            return;
+  private void compileComponent(VirtualFile javaComponent, VirtualFile htmlTemplate) {
+    try {
+      ProjectFileIndex projectFileIndex =
+          ProjectRootManager.getInstance(project).getFileIndex();
+      final Module module = projectFileIndex.getModuleForFile(javaComponent);
+      if (module == null) {
+        return;
+      }
 
-        ApplicationManager.getApplication().invokeLater(() -> compileComponent(javaFile, changedFile));
+      CompilerManager compilerManager = CompilerManager.getInstance(project);
+      if (!compilerManager.isCompilationActive()
+          && !compilerManager.isExcludedFromCompilation(javaComponent)) {
+        compilerManager.compile(new VirtualFile[]{javaComponent, htmlTemplate}, null);
+      }
+    } catch (Exception e) {
+      LOGGER.error(e.getMessage(), e);
     }
+  }
 
-    private void compileComponent(VirtualFile javaComponent, VirtualFile htmlTemplate)
-    {
-        try
-        {
-            ProjectFileIndex projectFileIndex =
-                ProjectRootManager.getInstance(project).getFileIndex();
-            final Module module = projectFileIndex.getModuleForFile(javaComponent);
-            if (module == null)
-                return;
+  @Nullable
+  private VirtualFile getSibling(VirtualFile file, String siblingName) {
+    VirtualFile parent = file.getParent();
+    if (parent == null) {
+      return null;
+    }
 
-            CompilerManager compilerManager = CompilerManager.getInstance(project);
-            if (!compilerManager.isCompilationActive()
-                && !compilerManager.isExcludedFromCompilation(javaComponent))
-            {
-                compilerManager.compile(new VirtualFile[] { javaComponent, htmlTemplate }, null);
-            }
-        }
-        catch (Exception e)
-        {
-            LOGGER.error(e.getMessage(), e);
-        }
+    VirtualFile siblingFile = parent.findChild(siblingName);
+    if (siblingFile == null) {
+      return null;
     }
+    return siblingFile;
+  }
 }

src/main/java/com/axellience/vuegwtplugin/VueGWTIcons.java

@@ -0,0 +1,15 @@
+package com.axellience.vuegwtplugin;
+
+import javax.swing.Icon;
+
+import com.intellij.openapi.util.IconLoader;
+
+public class VueGWTIcons
+{
+    public static final Icon VUE = load("/icons/vue-gwt.png");
+
+    private static Icon load(String path)
+    {
+        return IconLoader.getIcon(path, VueGWTIcons.class);
+    }
+}

src/main/java/com/axellience/vuegwtplugin/VueGWTTagNameReference.java

@@ -0,0 +1,23 @@
+package com.axellience.vuegwtplugin;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.impl.source.xml.TagNameReference;
+
+public class VueGWTTagNameReference extends TagNameReference
+{
+    private final PsiElement componentTemplate;
+
+    public VueGWTTagNameReference(ASTNode nameElement, PsiElement componentTemplate,
+        boolean startTagFlag)
+    {
+        super(nameElement, startTagFlag);
+        this.componentTemplate = componentTemplate;
+    }
+
+    @Override
+    public PsiElement resolve()
+    {
+        return componentTemplate;
+    }
+}