When multiple possible C# methods can match a yarnName, prioritize the following order: <yarncommand> in structured comment, [YarnCommand] attribute, AddCommandHandler call.

Author: pappleby

LanguageServer/src/Server/Handlers/SemanticTokensHandler.cs

@@ -37,8 +37,8 @@ protected override SemanticTokensRegistrationOptions CreateRegistrationOptions(S
                 DocumentSelector = Utils.YarnDocumentSelector,
                 Legend = new SemanticTokensLegend()
                 {
-                    TokenModifiers = capability.TokenModifiers,
-                    TokenTypes = capability.TokenTypes,
+                    TokenModifiers = capability?.TokenModifiers,
+                    TokenTypes = capability?.TokenTypes,
                 },
                 Full = new SemanticTokensCapabilityRequestFull
                 {

LanguageServer/src/Server/Workspace/CSharpFileData.cs

@@ -57,7 +57,7 @@ public void LookForUnmatchedCommands(bool isLastTime) {
             {
                 try
                 {
-                    Definitions[matchedUcn.YarnName] = CreateFunctionObject(Uri, matchedUcn.YarnName, command, matchedUcn.IsCommand, false);
+                    Definitions[matchedUcn.YarnName] = CreateFunctionObject(Uri, matchedUcn.YarnName, command, matchedUcn.IsCommand, 3, false);
                     Workspace.UnmatchedDefinitions.RemoveAll(ucn => ucn.YarnName == matchedUcn.YarnName);
                 }
                 catch (Exception e)
@@ -85,7 +85,7 @@ private void RegisterCommandAttributeMatches()
                     command.AttributeLists.First().Attributes.First(a => a.Name.ToString().Contains("YarnCommand"))
                     .ArgumentList.Arguments.First().ToString()
                     .Trim('\"');
-                Definitions[yarnName] = CreateFunctionObject(Uri, yarnName, command, true, true);
+                Definitions[yarnName] = CreateFunctionObject(Uri, yarnName, command, true, 2, true);
                 Workspace.UnmatchedDefinitions.RemoveAll(ucn => ucn.YarnName == yarnName); // Matched some comands, can mark them off the list!
             }
         }
@@ -105,7 +105,7 @@ private void RegisterCommentTaggedCommandsAndFunctions()
                 var isCommand = string.IsNullOrWhiteSpace(functionName);
                 if (!string.IsNullOrWhiteSpace(yarnName))
                 {
-                    Definitions[yarnName] = CreateFunctionObject(Uri, yarnName, match, isCommand, false);
+                    Definitions[yarnName] = CreateFunctionObject(Uri, yarnName, match, isCommand, 1, false);
                     Workspace.UnmatchedDefinitions.RemoveAll(ucn => ucn.YarnName == yarnName);
                 }
             }
@@ -140,7 +140,7 @@ private void RegisterCommandAndFunctionBridges()
 
         }
 
-        private RegisteredDefinition CreateFunctionObject(Uri uri, string yarnName, MethodDeclarationSyntax methodDeclaration, bool isCommand, bool isAttributeMatch = false)
+        private RegisteredDefinition CreateFunctionObject(Uri uri, string yarnName, MethodDeclarationSyntax methodDeclaration, bool isCommand, int priority, bool isAttributeMatch = false)
         {
             string documentation = string.Empty;
             Dictionary<string, string> paramsDocumentation = new Dictionary<string, string>();
@@ -245,6 +245,7 @@ private RegisteredDefinition CreateFunctionObject(Uri uri, string yarnName, Meth
                 IsBuiltIn = false,
                 IsCommand = isCommand,
                 Parameters = parameters,
+                Priority = priority,
                 MinParameterCount = parameters.Count(p => p.DefaultValue == null && !p.IsParamsArray),
                 MaxParameterCount = parameters.Any(p => p.IsParamsArray) ? null : parameters.Count(),
                 DefinitionRange = PositionHelper.GetRange(LineStarts, methodDeclaration.GetLocation().SourceSpan.Start, methodDeclaration.GetLocation().SourceSpan.End),

LanguageServer/src/Server/Workspace/FileDataObjects.cs

@@ -16,6 +16,7 @@ public struct RegisteredDefinition
         public int? MaxParameterCount;
         public bool IsCommand;
         public bool IsBuiltIn;
+        public int Priority; // If multiple defined using the same filetype, lower priority wins.
         public string Documentation; // Do we care about markup style docstrings?
         public string Language; // = "csharp" or "txt";
         public string Signature;

LanguageServer/src/Server/Workspace/JsonConfigFile.cs

@@ -26,7 +26,7 @@ private void RegisterDefinition(RegisteredDefinition f, bool isCommand, Uri uri,
             f.DefinitionFile = uri;
             f.IsCommand = isCommand;
             f.IsBuiltIn = IsBuiltIn;
-
+            f.Priority = 0;
             if (f.Parameters != null && !f.MinParameterCount.HasValue)
             {
                 f.MinParameterCount = f.Parameters.Count(p => p.DefaultValue == null && !p.IsParamsArray);

LanguageServer/src/Server/Workspace/Workspace.cs

@@ -268,9 +268,9 @@ private void FillFunctionDefinitionCache()
             results = results
                 .GroupBy(f => f.YarnName).Select(g => {
                     if (g.Count() == 1) { return g.First(); }
-
+                    if (g.All(f => f.DefinitionFile.ToString().EndsWith(".cs"))) { return g.OrderBy(f => f.Priority).First(); }
                     var jsonDef = g.FirstOrDefault(f => f.DefinitionFile.ToString().EndsWith(".json"));
-                    var csharpDef = g.FirstOrDefault(f => f.DefinitionFile.ToString().EndsWith(".cs") && !f.Signature.EndsWith("(?)"));
+                    var csharpDef = g.OrderBy(f => f.Priority).FirstOrDefault(f => f.DefinitionFile.ToString().EndsWith(".cs") && !f.Signature.EndsWith("(?)"));
                     if (string.IsNullOrWhiteSpace(csharpDef.YarnName)) { csharpDef = g.FirstOrDefault(f => f.DefinitionFile.ToString().EndsWith(".cs")); }
 
                     jsonDef.DefinitionFile = csharpDef.DefinitionFile;
@@ -311,6 +311,7 @@ private void FillFunctionDefinitionCache()
                                 Language = Utils.CSharpLanguageID,
                                 YarnName = bridge.yarnName,
                                 Documentation = string.Empty,
+                                Priority = 10,
                                 Signature = $"{bridge.yarnName}(?)",
                             };
                         }