Merge pull request #268 from rneatherway/issue255

Don't offer completions after just a '.'

Author: rneatherway

FSharp.AutoComplete/Program.fs

@@ -218,15 +218,14 @@ type internal IntelliSenseAgent() =
   /// and current residue.
   member x.DoCompletion(opts : RequestOptions, ((line, column) as pos), lineStr, time) : Option<DeclarationSet * String> =
     let info = x.GetTypeCheckInfo(opts, time)
-    Option.bind (fun (info: TypeCheckResults) ->
-      let longName, residue = Parsing.findLongIdentsAndResidue (column, lineStr)
-
-      // Get items & generate output
+    Option.bind (fun (longName, residue) ->
+      Option.bind (fun (info: TypeCheckResults) ->
       try
         Some (info.GetDeclarations(None, pos, lineStr, (longName, residue), fun (_,_) -> false)
               |> Async.RunSynchronously, residue)
       with :? System.TimeoutException as e ->
                  None) info
+      ) (Parsing.findLongIdentsAndResidue (column, lineStr))
 
   /// Gets ToolTip for the specified location (and prints it to the output)
   member x.GetToolTip(opts, ((line, column) as pos), lineStr, time) : Option<DataTipText> =

FSharp.CompilerBinding/Parser.fs

@@ -324,4 +324,12 @@ module Parsing =
         |> List.rev
         |> List.head
 
-    (longName, residue)
+    if String.IsNullOrEmpty residue &&
+       List.isEmpty longName &&
+       col >= 0 && col <= lineStr.Length &&
+       lineStr.[col - 1] = '.'
+    then
+        None
+    else
+        Some (longName, residue)
+

monodevelop/MonoDevelop.FSharpBinding/Services/LanguageService.fs

@@ -349,12 +349,15 @@ type internal TypedParseResult(info:TypeCheckResults, untyped : UntypedParseInfo
     /// (used to implement dot-completion in 'FSharpTextEditorCompletion.fs')
     member x.GetDeclarations(doc:Document, context: CodeCompletion.CodeCompletionContext) = 
         let line, col, lineStr = getLineInfoFromOffset(doc.Editor.Caret.Offset, doc.Editor.Document)
-        let longName, residue = Parsing.findLongIdentsAndResidue(col, lineStr)
 
-        // Get items & generate output
-        try Some (info.GetDeclarations(None, (line,col), lineStr, (longName, residue), fun (_,_) -> false)
-                  |> Async.RunSynchronously, residue)
-        with :? TimeoutException as e -> None
+        match Parsing.findLongIdentsAndResidue(col, lineStr) with
+        | None -> None
+        | Some (longName, residue) ->
+            Debug.WriteLine (sprintf "GetDeclarations: '%A', '%s'" longName residue)
+            // Get items & generate output
+            try Some (info.GetDeclarations(None, (line,col), lineStr, (longName, residue), fun (_,_) -> false)
+                      |> Async.RunSynchronously, residue)
+            with :? TimeoutException as e -> None
 
     /// Get the tool-tip to be displayed at the specified offset (relatively
     /// from the beginning of the current document)