azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Andrey Breslav
2011-04-01 15:48:55 +04:00
parent 1e5673f479 3425c42b7b
commit 15db4c5ad4
8 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/runConfigurations/All_Tests.xml
Generated
+33
View File
@@ -0,0 +1,33 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="All Tests" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.jet.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="idea" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="PACKAGE_NAME" value="org.jetbrains.jet" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="package" />
<option name="VM_PARAMETERS" value="" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="moduleWithDependencies" />
</option>
<envs />
<patterns />
<RunnerSettings RunnerId="Profile ">
<option name="myExternalizedOptions" value="&#13;&#10;snapshots-dir=&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;" />
</RunnerSettings>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
<method />
</configuration>
</component>
idea/idea.iml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="PLUGIN_MODULE" version="4">
<component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/META-INF/plugin.xml" />
<component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/META-INF/plugin.xml" />
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
idea/META-INF/plugin.xml → idea/src/META-INF/plugin.xml
View File
idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+1 -1
View File
@@ -1331,7 +1331,7 @@ public class JetParsing extends AbstractJetParsing {
* : "(" functionParameter{","}? ")" // default values
* ;
*
* functionParameter Машка Юдина Неееет! Зимой сельдерей не растет на улице!!! Как же так?
* functionParameter
* : modifiers functionParameterRest
* ;
*
idea/testData/mockJDK-1.7/jre/lib/annotations.jar
BIN
View File
Binary file not shown.
idea/testData/mockJDK-1.7/jre/lib/rt.jar
BIN
View File
Binary file not shown.
idea/testData/mockJDK-1.7/src.zip
BIN
View File
Binary file not shown.
idea/tests/org/jetbrains/jet/resolve/JetResolveTest.java
+1 -12
View File
@@ -15,8 +15,6 @@ import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.parsing.JetParsingTest;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.*;
/**
@@ -118,16 +116,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
}
public static Sdk jdkFromIdeaHome() {
Properties properties = new Properties();
try {
FileReader reader = new FileReader(getHomeDirectory() + "/idea/idea.properties");
properties.load(reader);
reader.close();
} catch (IOException e) {
throw new RuntimeException(e);
}
String home = properties.getProperty("idea.home");
return new JavaSdkImpl().createJdk("JDK", home + "/java/mockJDK-1.7/jre", true);
return new JavaSdkImpl().createJdk("JDK", "idea/testData/mockJDK-1.7/jre", true);
}
private static String getHomeDirectory() {