diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/ConfigureGroovyLibraryNotificationProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/ConfigureGroovyLibraryNotificationProvider.java index 4a918f38b76b..7c1da4df2ae3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/ConfigureGroovyLibraryNotificationProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/ConfigureGroovyLibraryNotificationProvider.java @@ -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; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompiler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompiler.java index d34154bd29de..f2d267b4c9b3 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompiler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompiler.java @@ -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 scriptExtensions = GroovyFileTypeLoader.getCustomGroovyScriptExtensions(); + final CompilerManager compilerManager = CompilerManager.getInstance(myProject); Set modules = new HashSet(); 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());