Merge pull request #883 from SlavaRa/feature/fixes_add_;_for_imports

Fixes add ";" for imports

Author: Meychi

External/Plugins/ASCompletion/Completion/ASComplete.cs

@@ -3951,7 +3951,6 @@ static internal void HandleCompletionInsert(ScintillaControl sci, int position,
             // let the context handle the insertion
             if (ASContext.Context.OnCompletionInsert(sci, position, text, trigger))
                 return;
-
             // event inserted
             if (item is EventItem)
             {
@@ -3962,18 +3961,19 @@ static internal void HandleCompletionInsert(ScintillaControl sci, int position,
             // default handling
             if (ASContext.Context.Settings != null)
             {
+                int textEndPosition = position + text.Length;
                 // was a fully qualified type inserted?
-                ASExpr expr = GetExpression(sci, position + text.Length);
+                ASExpr expr = GetExpression(sci, textEndPosition);
                 if (expr.Value == null) return;
-
+                ASResult type = GetExpressionType(sci, textEndPosition);
+                if (type.IsPackage) return;
                 ContextFeatures features = ASContext.Context.Features;
 
                 // add ; for imports
                 if (" \n\t".IndexOf(trigger) >= 0 && expr.WordBefore != null 
                     && (expr.WordBefore == features.importKey || expr.WordBefore == features.importKeyAlt))
                 {
-                    sci.InsertText(sci.CurrentPos, ";");
-                    sci.SetSel(sci.CurrentPos + 1, sci.CurrentPos + 1);
+                    if (!sci.GetLine(sci.CurrentLine).Contains(";")) sci.InsertText(sci.CurrentPos, ";");
                     return;
                 }