From bc38350453f27142fb3bf9cc4e4ff3921f723d03 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 11 Apr 2011 11:25:06 +0400
Subject: [PATCH 1/2] fixed building of plugin modules

---
 .../compiler/ArtifactsCompilerInstance.java   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsCompilerInstance.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsCompilerInstance.java
index 2eccc6bd92e1..376a1e56b1c7 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsCompilerInstance.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsCompilerInstance.java
@@ -95,19 +95,6 @@ public class ArtifactsCompilerInstance extends GenericCompilerInstance<ArtifactB
         else {
           artifacts = new HashSet<Artifact>(Arrays.asList(ArtifactManager.getInstance(getProject()).getArtifacts()));
         }
-        List<Artifact> additionalArtifacts = new ArrayList<Artifact>();
-        for (BuildParticipantProvider provider : BuildParticipantProvider.EXTENSION_POINT_NAME.getExtensions()) {
-          for (Module module : ModuleManager.getInstance(getProject()).getModules()) {
-            final Collection<? extends BuildParticipant> participants = provider.getParticipants(module);
-            for (BuildParticipant participant : participants) {
-              ContainerUtil.addIfNotNull(participant.createArtifact(myContext), additionalArtifacts);
-            }
-          }
-        }
-        if (LOG.isDebugEnabled() && !additionalArtifacts.isEmpty()) {
-          LOG.debug("additional artifacts to build: " + additionalArtifacts);
-        }
-        artifacts.addAll(additionalArtifacts);
 
         Map<String, Artifact> artifactsMap = new HashMap<String, Artifact>();
         for (Artifact artifact : artifacts) {
@@ -119,6 +106,19 @@ public class ArtifactsCompilerInstance extends GenericCompilerInstance<ArtifactB
             targets.add(new ArtifactBuildTarget(artifact));
           }
         }
+
+        for (BuildParticipantProvider provider : BuildParticipantProvider.EXTENSION_POINT_NAME.getExtensions()) {
+          for (Module module : ModuleManager.getInstance(getProject()).getModules()) {
+            final Collection<? extends BuildParticipant> participants = provider.getParticipants(module);
+            for (BuildParticipant participant : participants) {
+              Artifact artifact = participant.createArtifact(myContext);
+              if (artifact != null) {
+                LOG.debug("additional artifact to build: " + artifact);
+                targets.add(new ArtifactBuildTarget(artifact));
+              }
+            }
+          }
+        }
       }
     }.execute();
     return targets;

From 3ea75a0fa5c8b3bdd40062a8cd0a410953df594f Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 11 Apr 2011 10:20:40 +0400
Subject: [PATCH 2/2] typing in invalid injected editor

---
 .../editorActions/CompletionAutoPopupHandler.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
index 207642e11676..212bfa952ea4 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/CompletionAutoPopupHandler.java
@@ -23,13 +23,14 @@ import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.completion.impl.CompletionServiceImpl;
 import com.intellij.codeInsight.lookup.LookupManager;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
 
 /**
  * @author peter
@@ -96,7 +97,12 @@ public class CompletionAutoPopupHandler extends TypedHandlerDelegate {
         if (ApplicationManager.getApplication().isWriteAccessAllowed()) return; //it will fail anyway
         if (DumbService.getInstance(project).isDumb()) return;
 
-        invokeAutoPopupCompletion(project, editor);
+        // retrieve the injected file from scratch since our typing might have destroyed the old one completely
+        Editor topLevelEditor = InjectedLanguageUtil.getTopLevelEditor(editor);
+        PsiFile topLevelFile = InjectedLanguageUtil.getTopLevelFile(file);
+        PsiDocumentManager.getInstance(project).commitAllDocuments();
+        Editor newEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(topLevelEditor, topLevelFile);
+        invokeAutoPopupCompletion(project, newEditor);
       }
     };
     AutoPopupController.getInstance(project).invokeAutoPopupRunnable(request, CodeInsightSettings.getInstance().AUTO_LOOKUP_DELAY);