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

Refresh FS after compilation for js and sourcemap files.

Browse Source
This commit is contained in:
Zalim Bashorov
2013-11-08 12:26:39 +04:00
parent 637c6635bd
commit 1409dd7812
13 changed files with 171 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java
+17
View File
@@ -18,18 +18,24 @@ package org.jetbrains.jet.plugin.compiler;
import com.intellij.diagnostic.PluginException;
import com.intellij.ide.plugins.PluginManager;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.compiler.*;
import com.intellij.openapi.components.ProjectComponent;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.JetFileType;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.util.Collections;
import java.util.Set;
import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.KOTLIN_COMPILER_NAME;
@@ -39,6 +45,7 @@ public class JetCompilerManager implements ProjectComponent {
// Comes from external make
private static final String PREFIX_WITH_COMPILER_NAME = KOTLIN_COMPILER_NAME + ": " + INTERNAL_ERROR_PREFIX;
private static final Set<String> FILE_EXTS_WHICH_NEEDS_REFRESH = ContainerUtil.immutableSet(".js", ".map");
public JetCompilerManager(Project project, CompilerManager manager) {
manager.addTranslatingCompiler(new JetCompiler(),
@@ -64,6 +71,16 @@ public class JetCompilerManager implements ProjectComponent {
@Override
public void fileGenerated(String outputRoot, String relativePath) {
if (ApplicationManager.getApplication().isUnitTestMode()) return;
String ext = FileUtilRt.getExtension(relativePath).toLowerCase();
if (FILE_EXTS_WHICH_NEEDS_REFRESH.contains(ext)) {
String outFile = outputRoot + "/" + relativePath;
VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByPath(outFile);
assert virtualFile != null : "Virtual file not found for generated file path: " + outFile;
virtualFile.refresh(/*async =*/ false, /*recursive =*/ false);
}
}
}, project);
}
idea/src/org/jetbrains/jet/plugin/compiler/K2JSCompiler.java
-8
View File
@@ -16,14 +16,12 @@
package org.jetbrains.jet.plugin.compiler;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.compiler.*;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ModuleOrderEntry;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.OrderEntry;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Chunk;
import com.intellij.util.Function;
@@ -108,12 +106,6 @@ public final class K2JSCompiler implements TranslatingCompiler {
KotlinCompilerRunner.runK2JsCompiler(commonArguments, k2jsArguments, compilerSettings, messageCollector, environment,
outputItemsCollector, srcFiles, libraryFiles, outFile);
if (!ApplicationManager.getApplication().isUnitTestMode()) {
VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByIoFile(outDir);
assert virtualFile != null : "Virtual file not found for module output: " + outDir;
virtualFile.refresh(false, true);
}
TranslatingCompilerUtils.reportOutputs(sink, environment.getOutput(), outputItemsCollector);
}