UFCS using new completion kind F

README.md

@@ -132,6 +132,7 @@ tab character, followed by a completion kind
 * m - member variable name
 * k - keyword, built-in version, scope statement
 * f - function or method
+* F - UFCS function
 * g - enum name
 * e - enum member
 * P - package name

dsymbol/src/dsymbol/conversion/second.d

@@ -47,6 +47,7 @@ void secondPass(SemanticSymbol* currentSymbol, Scope* moduleScope, ref ModuleCac
 	case variableName:
 	case memberVariableName:
 	case functionName:
+	case ufcsName:
 	case aliasName:
 		// type may not be null in the case of a renamed import
 		if (currentSymbol.acSymbol.type is null)

dsymbol/src/dsymbol/symbol.d

@@ -75,6 +75,9 @@ enum CompletionKind : char
 	/// function or method
 	functionName = 'f',
 
+	/// UFCS function
+	ufcsName = 'F',
+
 	/// enum name
 	enumName = 'g',
 

src/dcd/server/autocomplete/ufcs.d

@@ -23,7 +23,7 @@ void lookupUFCS(Scope* completionScope, DSymbol* beforeDotSymbol, size_t cursorP
 
 AutocompleteResponse.Completion createCompletionForUFCS(const DSymbol* symbol)
 {
-    return AutocompleteResponse.Completion(symbol.name, symbol.kind, "(UFCS) " ~ symbol.callTip, symbol
+    return AutocompleteResponse.Completion(symbol.name, CompletionKind.ufcsName, symbol.callTip, symbol
             .symbolFile, symbol
             .location, symbol
             .doc);

tests/tc006/expected1.txt

@@ -1,6 +1,6 @@
 identifiers
 alignof	k
-doStuff	f
+doStuff	F
 init	k
 mangleof	k
 max	k

tests/tc006/expected3.txt

@@ -1,6 +1,6 @@
 identifiers
 alignof	k
-doStuff	f
+doStuff	F
 init	k
 mangleof	k
 max	k

tests/tc_erroneous_body_content/expected2.txt

@@ -1,7 +1,7 @@
 identifiers
 a	v
 alignof	k
-foo	f
+foo	F
 init	k
 mangleof	k
 sizeof	k

tests/tc_ufcs_completions/expected.txt

@@ -1,18 +1,18 @@
 identifiers
 alignof	k
 fooHey	f
-hasArgname	f
+hasArgname	F
 init	k
 mangleof	k
 sizeof	k
 stringof	k
 tupleof	k
-u	f
+u	F
-ufcsBar	f
+ufcsBar	F
-ufcsBarRef	f
+ufcsBarRef	F
-ufcsBarRefConst	f
+ufcsBarRefConst	F
-ufcsBarRefConstWrapped	f
+ufcsBarRefConstWrapped	F
-ufcsBarRefImmuttableWrapped	f
+ufcsBarRefImmuttableWrapped	F
-ufcsBarReturnScope	f
+ufcsBarReturnScope	F
-ufcsBarScope	f
+ufcsBarScope	F
-ufcsHello	f
+ufcsHello	F