Changeset 331 for trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui

Timestamp:

02/16/06 14:33:48 (19 years ago)

Author:

boris

Message:

• fixed a bug in code completion that couse it to crash and pop-up uggly dialog warnings
• removed some trace printouts

File:

• trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/editor/ModelicaCompletionProcessor.java (modified) (3 diffs)

trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/editor/ModelicaCompletionProcessor.java

@@ -255 +255 @@
             catch(BadLocationException e)
             {
+                System.out.println("shhh, don't say anything");
             }
             if(ch == '\n' || ch == '\t' || ch == ' '
@@ -376 +377 @@
             int offset)
     {
-        IEditorInput input = editor.getEditorInput();
+//      IEditorInput input = editor.getEditorInput();
         //TODO when eclipse restores the files that where left
         // in the editor area when it was closed last time the
@@ -382 +383 @@
         // thus code completion will not work, this should be fixed somehow
 
-        if (input instanceof ModelicaElementEditorInput)
-        {
-            IModelicaSourceFile file = 
-                ((ModelicaElementEditorInput)input).getSourceFile();
-            System.out.println("we are looking at " + file);
-            try
-            {
-                IModelicaClass clazz = file.getClassAt(offset);
-                if (clazz != null)
-                {
-                    System.out.println("class def is " + clazz.getElementName());
-                }
-                else
-                {
-                    System.out.println("no class here");
-                }
-            }
-            catch (Exception e)
-            {
-                System.out.println(e);
-                e.printStackTrace();
-            }
-        }
+//      if (input instanceof ModelicaElementEditorInput)
+//      {
+//          IModelicaSourceFile file = 
+//              ((ModelicaElementEditorInput)input).getSourceFile();
+//          System.out.println("we are looking at " + file);
+//          try
+//          {
+//              IModelicaClass clazz = file.getClassAt(offset);
+//              if (clazz != null)
+//              {
+//                  System.out.println("class def is " + clazz.getElementName());
+//              }
+//              else
+//              {
+//                  System.out.println("no class here");
+//              }
+//          }
+//          catch (Exception e)
+//          {
+//              System.out.println(e);
+//              e.printStackTrace();
+//          }
+//      }
         
         String className = findClassName(viewer, offset);
-
+        
+        if (className == null || className.equals(""))
+        {
+            /* bail out without any proposals */
+            return new ICompletionProposal[0];
+        }
+        
         if(className.charAt(className.length() - 1) == '.')
         {