summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2012-05-17 10:57:24 +0200
committerJason Zaugg <jzaugg@gmail.com>2012-05-17 10:57:24 +0200
commit420e181b30d1aae804fcaf1ef0b34429493bda15 (patch)
tree6fa3a7234feb458e556d77cac322d76ad19ac868 /src
parent9fe251e16b93d4bdc8a496f3edce90ef2e207ee8 (diff)
downloadscala-420e181b30d1aae804fcaf1ef0b34429493bda15.tar.gz
scala-420e181b30d1aae804fcaf1ef0b34429493bda15.tar.bz2
scala-420e181b30d1aae804fcaf1ef0b34429493bda15.zip
An IntelliJ module for test files.
This enables resolve, autocompletion and the usual goodness when editing tests. Also removes the sample configuration for the defunct dbc module.
Diffstat (limited to 'src')
-rw-r--r--src/intellij/dbc.iml.SAMPLE20
-rw-r--r--src/intellij/scala-lang.ipr.SAMPLE1
-rw-r--r--src/intellij/test.iml.SAMPLE16
3 files changed, 17 insertions, 20 deletions
diff --git a/src/intellij/dbc.iml.SAMPLE b/src/intellij/dbc.iml.SAMPLE
deleted file mode 100644
index d2647cfb26..0000000000
--- a/src/intellij/dbc.iml.SAMPLE
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="scala" name="Scala">
- <configuration>
- <option name="compilerLibraryLevel" value="Project" />
- <option name="compilerLibraryName" value="compiler-locker" />
- <option name="maximumHeapSize" value="1536" />
- <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=128M -d32 -server -XX:+UseParallelGC" />
- </configuration>
- </facet>
- </component>
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="library" />
- </component>
-</module>
-
diff --git a/src/intellij/scala-lang.ipr.SAMPLE b/src/intellij/scala-lang.ipr.SAMPLE
index 94a9329dd6..43d6362708 100644
--- a/src/intellij/scala-lang.ipr.SAMPLE
+++ b/src/intellij/scala-lang.ipr.SAMPLE
@@ -203,6 +203,7 @@
<module fileurl="file://$PROJECT_DIR$/scala.iml" filepath="$PROJECT_DIR$/scala.iml" />
<module fileurl="file://$PROJECT_DIR$/scalap.iml" filepath="$PROJECT_DIR$/scalap.iml" />
<module fileurl="file://$PROJECT_DIR$/swing.iml" filepath="$PROJECT_DIR$/swing.iml" />
+ <module fileurl="file://$PROJECT_DIR$/test.iml" filepath="$PROJECT_DIR$/test.iml" />
</modules>
</component>
<component name="ProjectResources">
diff --git a/src/intellij/test.iml.SAMPLE b/src/intellij/test.iml.SAMPLE
new file mode 100644
index 0000000000..e6729ae362
--- /dev/null
+++ b/src/intellij/test.iml.SAMPLE
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../../test" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="actors" />
+ <orderEntry type="module" module-name="compiler" />
+ <orderEntry type="module" module-name="continuations" />
+ <orderEntry type="module" module-name="library" />
+ <orderEntry type="module" module-name="swing" />
+ <orderEntry type="module" module-name="partest" />
+ </component>
+</module>
+