MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Do not use random encoding while compiling scratch files from external process, use the project-supplied one for that to fix IDEA-200826 IDEA Scratch File (java) seems cannot handle Chinese code

Browse Source 
GitOrigin-RevId: 7a77208c3d7777eb57a75f6392db8271d26223c5
This commit is contained in:
Alexey Kudravtsev
2020-05-05 11:43:16 +00:00
committed by intellij-monorepo-bot
parent 349c96eaee
commit ffc61a9296
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/scratch/JavaScratchCompilationSupport.java
+9 -2
View File
@@ -29,6 +29,7 @@ import org.jetbrains.jps.model.java.JpsJavaSdkType;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.*;
/**
@@ -88,6 +89,10 @@ final class JavaScratchCompilationSupport implements CompileTask {
try {
final File scratchFile = new File(VirtualFileManager.extractPath(scratchUrl));
File srcFile = scratchFile;
VirtualFile vFile = ReadAction.compute(() -> VirtualFileManager.getInstance().findFileByUrl(scratchUrl));
Charset charset = ReadAction.compute(() -> vFile == null ? null : vFile.getCharset());
if (!StringUtil.endsWith(srcFile.getName(), ".java")) {
final File srcDir = getScratchTempDirectory(project);
@@ -97,7 +102,6 @@ final class JavaScratchCompilationSupport implements CompileTask {
FileUtil.delete(srcDir); // perform cleanup
final String srcFileName = ReadAction.compute(() -> {
final VirtualFile vFile = VirtualFileManager.getInstance().findFileByUrl(scratchUrl);
if (vFile != null) {
final PsiFile psiFile = PsiManager.getInstance(project).findFile(vFile);
if (psiFile instanceof PsiJavaFile) {
@@ -160,7 +164,10 @@ final class JavaScratchCompilationSupport implements CompileTask {
}
}
options.add("-proc:none"); // disable annotation processing
if (charset != null) {
options.add("-encoding");
options.add(charset.name());
}
final Collection<ClassObject> result = CompilerManager.getInstance(project).compileJavaCode(
options, platformCp, cp, Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), files, outputDir
);