[imp-commit] r22884 - trunk/org.eclipse.imp.runtime/src/org/eclipse/imp/

[genie@xxxxxxxxxxx]

Author: rfuhrer
Date: 2011-03-07 09:30:24 -0500 (Mon, 07 Mar 2011)
New Revision: 22884

Modified:
   trunk/org.eclipse.imp.runtime/src/org/eclipse/imp/editor/UniversalEditor.java
Log:
getAdapter() no longer responds to requests for an IAnnotationModel, since that breaks the editor in the presence of search hit annotations.

Modified: trunk/org.eclipse.imp.runtime/src/org/eclipse/imp/editor/UniversalEditor.java
===================================================================
--- trunk/org.eclipse.imp.runtime/src/org/eclipse/imp/editor/UniversalEditor.java	2011-03-04 15:44:47 UTC (rev 22883)
+++ trunk/org.eclipse.imp.runtime/src/org/eclipse/imp/editor/UniversalEditor.java	2011-03-07 14:30:24 UTC (rev 22884)
@@ -305,9 +305,13 @@
         if (IContextProvider.class.equals(required)) {
             return IMPHelp.getHelpContextProvider(this, fLanguageServiceManager, IMP_EDITOR_CONTEXT);
         }
-        if (IAnnotationModel.class.equals(required)) {
-            return fAnnotationModel;
-        }
+        // This was intended to simplify a bit of test code. Unfortunately, it breaks the editor
+        // in the presence of search hits, since the search UI classes actually look for an editor
+        // that adapts to IAnnotationModel, and behave differently, and this interacts badly with
+        // the projection (i.e. folding) support. Go figure.
+//      if (IAnnotationModel.class.equals(required)) {
+//          return fAnnotationModel;
+//      }
         return super.getAdapter(required);
     }