Changeset 1857

Timestamp:

03/17/14 00:13:56 (11 years ago)

Author:

masberg

Message:

Fix so that if there is only a single completion proposal, it is inserted automatically.

File:

• trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/editor/ModelicaSourceViewerConfig.java (modified) (16 diffs)

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

@@ -2 +2 @@
  * @author Adrian Pop
  * Copyright (c) 2006 Adrian Pop, adrpo@ida.liu.se
- * All rights reserved. 
+ * All rights reserved.
  * Permission to use, copy, modify, and distribute this software and
- * its documentation for NON-COMMERCIAL purposes and without fee is hereby 
- * granted, provided that this copyright notice appear in all copies and 
+ * its documentation for NON-COMMERCIAL purposes and without fee is hereby
+ * granted, provided that this copyright notice appear in all copies and
  * that both the copyright notice and this permission notice and warranty
  * disclaimer appear in supporting documentation, and that the name of
  * The Author not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior permission.
- * 
- * COMMERCIAL use, copy, modification and distribution 
+ *
+ * COMMERCIAL use, copy, modification and distribution
  * is NOT permitted without prior agreement with Adrian Pop.
- * 
+ *
  * THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
@@ -66 +66 @@
 
 /**
- * 
+ *
  * @author Adrian Pop
  *   - big changes, splited scanners for different partitions, etc
  */
-public class ModelicaSourceViewerConfig extends TextSourceViewerConfiguration 
-{   
+public class ModelicaSourceViewerConfig extends TextSourceViewerConfiguration
+{
     private ModelicaCodeScanner              fCodeScanner;              /* for code parts and strings */
     private ModelicaMultilineCommentScanner  fMultilineCommentScanner;  /* for C comments */
     private ModelicaSinglelineCommentScanner fSinglelineCommentScanner; /* for single line comments */
     private ModelicaStringScanner            fStringScanner;            /* for strings and comment strings */
-    
+
     private ITextEditor textEditor;
-        
+
     private String fDocumentPartitioning;
-    
-    public ModelicaSourceViewerConfig(ITextEditor textEditor, String partitioning) 
+
+    public ModelicaSourceViewerConfig(ITextEditor textEditor, String partitioning)
     {
         this.textEditor = textEditor;
@@ -87 +87 @@
     }
 
-    protected ModelicaCodeScanner getCodeScanner() 
-    {
-        if (fCodeScanner == null) 
+    protected ModelicaCodeScanner getCodeScanner()
+    {
+        if (fCodeScanner == null)
         {
             fCodeScanner = new ModelicaCodeScanner();
@@ -97 +97 @@
         return fCodeScanner;
     }
-    
-    protected ModelicaMultilineCommentScanner getMultilineCommentScanner() 
-    {
-        if (fMultilineCommentScanner == null) 
+
+    protected ModelicaMultilineCommentScanner getMultilineCommentScanner()
+    {
+        if (fMultilineCommentScanner == null)
         {
             fMultilineCommentScanner = new ModelicaMultilineCommentScanner();
@@ -109 +109 @@
     }
 
-    protected ModelicaSinglelineCommentScanner getSinglelineCommentScanner() 
-    {
-        if (fSinglelineCommentScanner == null) 
+    protected ModelicaSinglelineCommentScanner getSinglelineCommentScanner()
+    {
+        if (fSinglelineCommentScanner == null)
         {
             fSinglelineCommentScanner = new ModelicaSinglelineCommentScanner();
@@ -120 +120 @@
     }
 
-    protected ModelicaStringScanner getStringScanner() 
-    {
-        if (fStringScanner == null) 
+    protected ModelicaStringScanner getStringScanner()
+    {
+        if (fStringScanner == null)
         {
             fStringScanner = new ModelicaStringScanner();
@@ -130 +130 @@
         return fStringScanner;
     }
-        
-    public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) 
+
+    public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer)
     {
         PresentationReconciler reconciler = new PresentationReconciler();
-        
+
         reconciler.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
-        
+
         DefaultDamagerRepairer drCode = new DefaultDamagerRepairer(getCodeScanner());
         reconciler.setDamager(drCode, IDocument.DEFAULT_CONTENT_TYPE);
         reconciler.setRepairer(drCode, IDocument.DEFAULT_CONTENT_TYPE);
-        
-        DefaultDamagerRepairer drMultilineComments = new DefaultDamagerRepairer(getMultilineCommentScanner());      
+
+        DefaultDamagerRepairer drMultilineComments = new DefaultDamagerRepairer(getMultilineCommentScanner());
         reconciler.setDamager(drMultilineComments, IModelicaPartitions.MODELICA_MULTI_LINE_COMMENT);
-        reconciler.setRepairer(drMultilineComments, IModelicaPartitions.MODELICA_MULTI_LINE_COMMENT);       
-        
-        DefaultDamagerRepairer drSingleComments = new DefaultDamagerRepairer(getSinglelineCommentScanner());        
+        reconciler.setRepairer(drMultilineComments, IModelicaPartitions.MODELICA_MULTI_LINE_COMMENT);
+
+        DefaultDamagerRepairer drSingleComments = new DefaultDamagerRepairer(getSinglelineCommentScanner());
         reconciler.setDamager(drSingleComments, IModelicaPartitions.MODELICA_SINGLE_LINE_COMMENT);
         reconciler.setRepairer(drSingleComments, IModelicaPartitions.MODELICA_SINGLE_LINE_COMMENT);
-        
+
         DefaultDamagerRepairer drStrings = new DefaultDamagerRepairer(getStringScanner());
         reconciler.setDamager(drStrings, IModelicaPartitions.MODELICA_STRING);
-        reconciler.setRepairer(drStrings, IModelicaPartitions.MODELICA_STRING);     
-                
+        reconciler.setRepairer(drStrings, IModelicaPartitions.MODELICA_STRING);
+
         return reconciler;
     }
-    
+
     public IContentAssistant getContentAssistant(ISourceViewer sourceViewer)
     {
         ContentAssistant assistant = new ContentAssistant();
-        
+
         assistant.setContentAssistProcessor(new ModelicaCompletionProcessor(textEditor), IDocument.DEFAULT_CONTENT_TYPE);
         DialogSettings s = new DialogSettings("completion_proposal_size");
         s.put(ContentAssistant.STORE_SIZE_X, "550");
-        s.put(ContentAssistant.STORE_SIZE_Y, "280");        
+        s.put(ContentAssistant.STORE_SIZE_Y, "280");
         assistant.setRestoreCompletionProposalSize(s);
         assistant.enableAutoActivation(true);
@@ -173 +173 @@
         assistant.setInformationControlCreator(getInformationPresenterControlCreator(sourceViewer));
         assistant.setRepeatedInvocationMode(true);
-        
+        assistant.enableAutoInsert(true);
 
         return assistant;
     }
-    
+
     //TODO Adrian Pop, please add the tab length to the Modelica Preferences page!
-    public int getTabWidth(ISourceViewer sourceViewer) 
+    public int getTabWidth(ISourceViewer sourceViewer)
     {
         /* return the peter fritzson constant */
@@ -205 +205 @@
             return fDocumentPartitioning;
         return super.getConfiguredDocumentPartitioning(sourceViewer);
-    }   
+    }
 
     public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
@@ -223 +223 @@
     }
 
-    
-    public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask) 
-    {
-        
+
+    public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType, int stateMask)
+    {
+
         if (contentType.equals(IDocument.DEFAULT_CONTENT_TYPE))
         {
@@ -235 +235 @@
         else return super.getTextHover(sourceViewer, contentType);
     }
-    
+
     public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
         return getTextHover(sourceViewer, contentType, ITextViewerExtension2.DEFAULT_HOVER_STATE_MASK);
     }
-    
-    
+
+
     /**
      * Returns the information presenter control creator. The creator is a factory creating the
@@ -259 +259 @@
         };
     }
-    
-    
+
+
     /*
      * @see SourceViewerConfiguration#getInformationPresenter(ISourceViewer)
      * @since 2.0
      */
-    public IInformationPresenter getInformationPresenter(ISourceViewer sourceViewer) 
+    public IInformationPresenter getInformationPresenter(ISourceViewer sourceViewer)
     {
         InformationPresenter presenter= new InformationPresenter(getInformationPresenterControlCreator(sourceViewer));
@@ -276 +276 @@
         return presenter;
     }
-    
+
     /*
      * @see SourceViewerConfiguration#getAnnotationHover(ISourceViewer)
@@ -282 +282 @@
     public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
         return new ModelicaAnnotationHover() {
-            protected boolean isIncluded(Annotation annotation) 
+            protected boolean isIncluded(Annotation annotation)
             {
                 return isShowInVerticalRuler(annotation);
-            }           
+            }
         };
     }
@@ -295 +295 @@
     public IAnnotationHover getOverviewRulerAnnotationHover(ISourceViewer sourceViewer) {
         return new ModelicaAnnotationHover() {
-            protected boolean isIncluded(Annotation annotation) 
+            protected boolean isIncluded(Annotation annotation)
             {
                 return isShowInOverviewRuler(annotation);
@@ -331 +331 @@
     {
         return null;
-    }   
-    
+    }
+
 }