Custom operations are at the top of completion list & remove active pattern values from the list (#4831)

* custom operations are at the top of completion list

* do not pick rhs NameResolutionEnvironment in completion if it corresponds to a computation expression

* Revert "do not pick rhs NameResolutionEnvironment in completion if it corresponds to a computation expression"

This reverts commit 4548ca2ea2fb730f9b896462bd00745621e3b245.

* fix after merge

* put active patterns (as functions) to the very end of completion list

* filter out active patterns-as-value from completion list

* Revert "put active patterns (as functions) to the very end of completion list"

This reverts commit c26b24cc4a730bb0f741b73f39cc4601b7810127.

Author: vasily-kirichenko

src/fsharp/service/ServiceDeclarationLists.fs

@@ -615,15 +615,23 @@ type FSharpDeclarationListInfo(declarations: FSharpDeclarationListItem[], isForT
                     | None -> item.Item.DisplayName
                 name, items)
 
-        // Filter out operators (and list)
+        // Filter out operators, active patterns (as values) and the empty list
         let items = 
             // Check whether this item looks like an operator.
             let isOperatorItem(name, items: CompletionItem list) = 
                 match items |> List.map (fun x -> x.Item) with
                 | [Item.Value _ | Item.MethodGroup _ | Item.UnionCase _] -> IsOperatorName name
                 | _ -> false              
-            let isFSharpList name = (name = "[]") // list shows up as a Type and a UnionCase, only such entity with a symbolic name, but want to filter out of intellisense
-            items |> List.filter (fun (displayName, items) -> not (isOperatorItem(displayName, items)) && not (isFSharpList displayName)) 
+            
+            let isActivePatternItem (items: CompletionItem list) =
+                match items |> List.map (fun x -> x.Item) with
+                | [Item.Value vref] -> IsActivePatternName vref.CompiledName
+                | _ -> false
+            
+            items |> List.filter (fun (displayName, items) -> 
+                not (isOperatorItem(displayName, items)) && 
+                not (displayName = "[]") && // list shows up as a Type and a UnionCase, only such entity with a symbolic name, but want to filter out of intellisense
+                not (isActivePatternItem items))
 
         let decls = 
             items 

src/fsharp/service/service.fs

@@ -577,6 +577,7 @@ type TypeCheckInfo
             | Item.Event _ -> CompletionItemKind.Event
             | Item.ILField _ 
             | Item.Value _ -> CompletionItemKind.Field
+            | Item.CustomOperation _ -> CompletionItemKind.CustomOperation
             | _ -> CompletionItemKind.Other
 
         { ItemWithInst = item

src/fsharp/symbols/SymbolHelpers.fs

@@ -275,6 +275,7 @@ type CompletionItemKind =
     | Method of isExtension : bool
     | Event
     | Argument
+    | CustomOperation
     | Other
 
 type UnresolvedSymbol =

src/fsharp/symbols/SymbolHelpers.fsi

@@ -113,6 +113,7 @@ type public CompletionItemKind =
     | Method of isExtension : bool
     | Event
     | Argument
+    | CustomOperation
     | Other
 
 type UnresolvedSymbol =

vsintegration/src/FSharp.Editor/Completion/CompletionUtils.fs

@@ -102,10 +102,11 @@ module internal CompletionUtils =
 
     let inline getKindPriority kind =
         match kind with
-        | CompletionItemKind.Property -> 0
-        | CompletionItemKind.Field -> 1
-        | CompletionItemKind.Method (isExtension = false) -> 2
-        | CompletionItemKind.Event -> 3
-        | CompletionItemKind.Argument -> 4
-        | CompletionItemKind.Other -> 5
-        | CompletionItemKind.Method (isExtension = true) -> 6
+        | CompletionItemKind.CustomOperation -> 0
+        | CompletionItemKind.Property -> 1
+        | CompletionItemKind.Field -> 2
+        | CompletionItemKind.Method (isExtension = false) -> 3
+        | CompletionItemKind.Event -> 4
+        | CompletionItemKind.Argument -> 5
+        | CompletionItemKind.Other -> 6
+        | CompletionItemKind.Method (isExtension = true) -> 7

vsintegration/tests/UnitTests/CompletionProviderTests.fs

@@ -603,6 +603,20 @@ module M2 =
 """
     VerifyCompletionList(fileContents, "    Ext", ["Extensions"; "ExtraTopLevelOperators"], [])
 
+[<Test>]
+let ``Custom operations should be at the top of completion list inside computation expression``() =
+    let fileContents = """
+let joinLocal = 1
+
+let _ =
+    query {
+        for i in 1..10 do
+        select i
+        join
+    }
+"""
+    VerifyCompletionList(fileContents, "        join", ["groupJoin"; "join"; "leftOuterJoin"; "joinLocal"], [])
+
 #if EXE
 ShouldDisplaySystemNamespace()
 #endif