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

Ignore workspace.xml

Browse Source
This commit is contained in:
Andrey Breslav
2012-03-06 19:04:58 +04:00
parent f834ed4517
commit 73fedd7ff6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -1,6 +1,7 @@
idea/idea.properties idea/idea.properties
examples/.idea/dictionaries examples/.idea/dictionaries
examples/.idea/workspace.xml examples/.idea/workspace.xml
libraries/.idea/workspace.xml
confluence/target confluence/target
confluence/target confluence/target
out out
idea/src/org/jetbrains/jet/plugin/internal/codewindow/BytecodeToolwindow.java
+3 -4
View File
@@ -37,12 +37,10 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager; import com.intellij.psi.PsiManager;
import com.intellij.util.Alarm; import com.intellij.util.Alarm;
import org.jetbrains.jet.codegen.ClassBuilderFactories; import org.jetbrains.jet.codegen.ClassBuilderFactories;
import org.jetbrains.jet.codegen.ClassBuilderFactory;
import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.ClassFileFactory;
import org.jetbrains.jet.codegen.CompilationErrorHandler; import org.jetbrains.jet.codegen.CompilationErrorHandler;
import org.jetbrains.jet.codegen.GenerationState; import org.jetbrains.jet.codegen.GenerationState;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade; import org.jetbrains.jet.plugin.compiler.WholeProjectAnalyzerFacade;
@@ -204,9 +202,10 @@ public class BytecodeToolwindow extends JPanel implements Disposable {
GenerationState state = new GenerationState(myProject, ClassBuilderFactories.TEXT); GenerationState state = new GenerationState(myProject, ClassBuilderFactories.TEXT);
try { try {
BindingContext binding = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file); BindingContext binding = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file);
AnalyzingUtils.throwExceptionOnErrors(binding); // AnalyzingUtils.throwExceptionOnErrors(binding);
state.compileCorrectFiles(binding, Collections.singletonList(file), CompilationErrorHandler.THROW_EXCEPTION, true); state.compileCorrectFiles(binding, Collections.singletonList(file), CompilationErrorHandler.THROW_EXCEPTION, true);
} catch (Exception e) { }
catch (Exception e) {
StringWriter out = new StringWriter(1024); StringWriter out = new StringWriter(1024);
e.printStackTrace(new PrintWriter(out)); e.printStackTrace(new PrintWriter(out));
return out.toString().replaceAll("\r", ""); return out.toString().replaceAll("\r", "");