assets matching line ids are now preferred.

I think we do need to come up with a better long term system for better association.
Fixes YarnSpinnerTool/IssuesDiscussion#97

Author: McJones

CHANGELOG.md

@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Each assembly now gets it's own YSLS file when generating them.
   - renamed the test asmdef files from `YarnSpinnerTests.x` to `YarnSpinner.Unity.Tests.X` so that they are matched by the existing filters.
 - Generated YSLS file now matches the newer schema, see the YS core repo for details of this
+- When matching assets to line IDs the importer now prefers exact matches to the line ID
 
 ### Removed
 

Editor/Utility/YarnProjectUtility.cs

@@ -238,38 +238,41 @@ internal static Dictionary<string, string> FindAssetPathsForLineIDs(IEnumerable<
             var allFiles = Directory.EnumerateFiles(assetsFolderPath, "*", SearchOption.AllDirectories)
                 .Where(path => path.EndsWith(".meta") == false)
                 .Where(path => assetType.IsAssignableFrom(AssetDatabase.GetMainAssetTypeAtPath(path)));
-
+            
             // Match files with those whose filenames contain a line ID
-            var matchedFilesAndPaths = lineIDs.GroupJoin(
-                // the elements we're matching lineIDs to
-                allFiles,
-                // the key for lineIDs (being strings, it's just the line ID
-                // itself)
-                lineID => lineID,
-                // the key for assets (the filename without the path)
-                assetPath => Path.GetFileName(assetPath),
-                // the way we produce the result (a key-value pair)
-                (lineID, assetPaths) =>
+            // If a direct file match is found prefer that
+            Dictionary<string, string> assets = new();
+            foreach (var lineID in lineIDs)
+            {
+                var lineIDWithoutPrefix = lineID.Replace("line:", "").ToLowerInvariant();
+                var candidates = new List<string>();
+                foreach (var asset in allFiles)
                 {
-                    if (assetPaths.Count() > 1)
+                    var file = Path.GetFileNameWithoutExtension(asset).ToLowerInvariant();
+
+                    if (file == lineIDWithoutPrefix)
+                    {
+                        assets[lineIDWithoutPrefix] = asset;
+                        break;
+                    }
+
+                    if (file.Contains(lineIDWithoutPrefix))
                     {
-                        Debug.LogWarning($"Line {lineID} has {assetPaths.Count()} possible assets.\n{string.Join(", ", assetPaths)}");
+                        candidates.Add(asset);
                     }
-                    return new { lineID, assetPaths };
-                },
-                // the way we test to see if two elements should be joined (does
-                // the filename contain the line ID?)
-                Compare.By<string>((fileName, lineID) =>
+                }
+
+                var count = candidates.Count();
+                if (count > 0)
                 {
-                    var lineIDWithoutPrefix = lineID.Replace("line:", "");
-                    return Path.GetFileNameWithoutExtension(fileName).Contains(lineIDWithoutPrefix);
-                })
-                )
-                // Discard any pair where no asset was found
-                .Where(pair => pair.assetPaths.Count() > 0)
-                .ToDictionary(entry => entry.lineID, entry => entry.assetPaths.FirstOrDefault());
-
-            return matchedFilesAndPaths;
+                    assets[lineID] = candidates.FirstOrDefault();
+                    if (count > 1)
+                    {
+                        Debug.LogWarning($"Discovered {count} candidates for {lineID}. Selecting one.");
+                    }
+                }
+            }
+            return assets;
         }
 
         /// <summary>