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

IDEA-73903 Groovy files excluded from compilation

Browse Source
This commit is contained in:
Maxim Medvedev
2011-09-05 16:02:49 +04:00
parent e362f6d8a3
commit e99b6beaa2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/ConfigureGroovyLibraryNotificationProvider.java
+2
View File
@@ -16,6 +16,7 @@
package org.jetbrains.plugins.groovy.annotator;
import com.intellij.ProjectTopics;
import com.intellij.openapi.compiler.CompilerManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
@@ -75,6 +76,7 @@ public class ConfigureGroovyLibraryNotificationProvider implements EditorNotific
public EditorNotificationPanel createNotificationPanel(VirtualFile file) {
try {
if (!supportedFileTypes.contains(file.getFileType())) return null;
if (CompilerManager.getInstance(myProject).isExcludedFromCompilation(file)) return null;
final Module module = ModuleUtil.findModuleForFile(file, myProject);
if (module == null) return null;
plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompiler.java
+4 -2
View File
@@ -20,6 +20,7 @@ import com.intellij.compiler.CompilerConfiguration;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.compiler.CompileContext;
import com.intellij.openapi.compiler.CompileScope;
import com.intellij.openapi.compiler.CompilerManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleType;
@@ -198,9 +199,10 @@ public class GroovyCompiler extends GroovyCompilerBase {
final Set<String> scriptExtensions = GroovyFileTypeLoader.getCustomGroovyScriptExtensions();
final CompilerManager compilerManager = CompilerManager.getInstance(myProject);
Set<Module> modules = new HashSet<Module>();
for (VirtualFile file : files) {
if (scriptExtensions.contains(file.getExtension())) {
if (scriptExtensions.contains(file.getExtension()) || compilerManager.isExcludedFromCompilation(file)) {
continue;
}
@@ -237,7 +239,7 @@ public class GroovyCompiler extends GroovyCompilerBase {
GroovyBundle.message("cannot.compile"));
}
else {
StringBuffer modulesList = new StringBuffer();
StringBuilder modulesList = new StringBuilder();
for (int i = 0; i < noJdkArray.length; i++) {
if (i > 0) modulesList.append(", ");
modulesList.append(noJdkArray[i].getName());