CLJ-113

CLJ-114
cprice404 · Dec 15, 2011 · 15d386c · 15d386c
1 parent d2cd19f
commit 15d386c
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 6 deletions.
diff --git a/clojure-intellij-plugin.ipr b/clojure-intellij-plugin.ipr
@@ -274,6 +274,44 @@
       </item>
     </group>
   </component>
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <option name="OTHER_INDENT_OPTIONS">
+          <value>
+            <option name="INDENT_SIZE" value="2" />
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+            <option name="TAB_SIZE" value="2" />
+            <option name="USE_TAB_CHARACTER" value="false" />
+            <option name="SMART_TABS" value="false" />
+            <option name="LABEL_INDENT_SIZE" value="0" />
+            <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+            <option name="USE_RELATIVE_INDENTS" value="false" />
+          </value>
+        </option>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+        <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
+          <option name="INDENT_SIZE" value="2" />
+        </ADDITIONAL_INDENT_OPTIONS>
+        <codeStyleSettings language="Groovy">
+          <indentOptions>
+            <option name="INDENT_SIZE" value="2" />
+            <option name="TAB_SIZE" value="2" />
+          </indentOptions>
+        </codeStyleSettings>
+        <codeStyleSettings language="JAVA">
+          <indentOptions>
+            <option name="INDENT_SIZE" value="2" />
+            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+            <option name="TAB_SIZE" value="2" />
+          </indentOptions>
+        </codeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
   <component name="ProjectDetails">
     <option name="projectName" value="clojure-intellij-plugin" />
   </component>

diff --git a/src/org/jetbrains/plugins/clojure/refactoring/rename/RenameClojureFileProcessor.clj b/src/org/jetbrains/plugins/clojure/refactoring/rename/RenameClojureFileProcessor.clj
@@ -1,9 +1,8 @@
 (ns org.jetbrains.plugins.clojure.refactoring.rename.RenameClojureFileProcessor
-  (:gen-class
-    :extends com.intellij.refactoring.rename.RenamePsiElementProcessor
-    :exposes-methods {renameElement superRenameElement}
-    :state state
-    :init init)
+  (:gen-class :extends com.intellij.refactoring.rename.RenamePsiElementProcessor
+              :exposes-methods {renameElement superRenameElement}
+              :state state
+              :init init)
 
   (:import [org.jetbrains.plugins.clojure.psi.api ClojureFile]
            [com.intellij.openapi.util.text StringUtil]))

diff --git a/src/org/jetbrains/plugins/clojure/repl/ClojureConsoleRunner.java b/src/org/jetbrains/plugins/clojure/repl/ClojureConsoleRunner.java
@@ -14,6 +14,7 @@
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.compiler.CompilerPaths;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.JavaSdkType;
@@ -33,6 +34,7 @@
 import org.jetbrains.plugins.clojure.config.ClojureConfigUtil;
 import org.jetbrains.plugins.clojure.config.ClojureFacet;
 import org.jetbrains.plugins.clojure.settings.ClojureProjectSettings;
+import org.jetbrains.plugins.clojure.utils.ClojureUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -280,6 +282,11 @@ private static ArrayList<String> createRuntimeArgs(Module module, String working
         cpVFiles.addAll(Arrays.asList(orderEntry.getFiles(OrderRootType.SOURCES)));
       }
     }
+    // Also add output folders
+    final VirtualFile outputDirectory = CompilerPaths.getModuleOutputDirectory(module, false);
+    if (outputDirectory != null) {
+      cpVFiles.add(outputDirectory);
+    }
 
     for (VirtualFile file : cpVFiles) {
       params.getClassPath().add(file.getPath());
@@ -308,8 +315,10 @@ private static ArrayList<String> createRuntimeArgs(Module module, String working
 
   private static String getMainReplClass(Module module) {
     final ClojureFacet facet = getClojureFacet(module);
+    if (facet == null) {
+      return ClojureUtils.CLOJURE_MAIN;
+    }
     return facet.getReplClass();
-
   }
 
   private GeneralCommandLine createCommandLine(Module module, String workingDir) throws CantRunException {