Refactor

Author: sailro

Packages/com.unity.ide.visualstudio.tests/Tests/Editor/SynchronizerBuilder.cs

@@ -248,7 +248,7 @@ public override bool TryGetInstallationForPath(string editorPath, out CodeEditor
 				return true;
 			}
 
-			internal override bool TryGetVisualStudioInstallationForPath(string editorPath, bool searchInstallations, out IVisualStudioInstallation installation)
+			internal override bool TryGetVisualStudioInstallationForPath(string editorPath, bool lookupDiscoveredInstallations, out IVisualStudioInstallation installation)
 			{
 				var mock = new Mock<IVisualStudioInstallation>();
 				mock.Setup(x => x.SupportsAnalyzers).Returns(true);

Packages/com.unity.ide.visualstudio/Editor/Cli.cs

@@ -23,7 +23,7 @@ internal static string GetInstallationDetails(IVisualStudioInstallation installa
 
 		internal static void GenerateSolutionWith(VisualStudioEditor vse, string installationPath)
 		{
-			if (vse != null && vse.TryGetVisualStudioInstallationForPath(installationPath, searchInstallations: true, out var vsi))
+			if (vse != null && vse.TryGetVisualStudioInstallationForPath(installationPath, lookupDiscoveredInstallations: true, out var vsi))
 			{
 				Log($"Using {GetInstallationDetails(vsi)}");
 				vse.SyncAll();

Packages/com.unity.ide.visualstudio/Editor/ProjectGeneration/ProjectGeneration.cs

@@ -185,7 +185,7 @@ private static bool ShouldSyncOnReimportedAsset(string asset)
 		private void RefreshCurrentInstallation()
 		{
 			var editor = CodeEditor.CurrentEditor as VisualStudioEditor;
-			editor?.TryGetVisualStudioInstallationForPath(CodeEditor.CurrentEditorInstallation, searchInstallations: true, out m_CurrentInstallation);
+			editor?.TryGetVisualStudioInstallationForPath(CodeEditor.CurrentEditorInstallation, lookupDiscoveredInstallations: true, out m_CurrentInstallation);
 		}
 
 		static ProfilerMarker solutionSyncMarker = new ProfilerMarker("SolutionSynchronizerSync");

Packages/com.unity.ide.visualstudio/Editor/VisualStudioEditor.cs

@@ -4,6 +4,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -23,11 +24,13 @@ public class VisualStudioEditor : IExternalCodeEditor
 		internal static bool IsOSX => Application.platform == RuntimePlatform.OSXEditor;
 		internal static bool IsWindows => !IsOSX && Path.DirectorySeparatorChar == FileUtility.WinSeparator && Environment.NewLine == "\r\n";
 
-		CodeEditor.Installation[] IExternalCodeEditor.Installations => _discoverInstallations.Result
-			.Select(i => i.ToCodeEditorInstallation())
+		CodeEditor.Installation[] IExternalCodeEditor.Installations => _discoverInstallations
+			.Result
+			.Values
+			.Select(v => v.ToCodeEditorInstallation())
 			.ToArray();
 
-		private static readonly AsyncOperation<IVisualStudioInstallation[]> _discoverInstallations;
+		private static readonly AsyncOperation<Dictionary<string, IVisualStudioInstallation>> _discoverInstallations;
 
 		static VisualStudioEditor()
 		{
@@ -37,21 +40,21 @@ static VisualStudioEditor()
 			Discovery.Initialize();
 			CodeEditor.Register(new VisualStudioEditor());
 
-			_discoverInstallations = AsyncOperation<IVisualStudioInstallation[]>.Run(DiscoverInstallations);
+			_discoverInstallations = AsyncOperation<Dictionary<string, IVisualStudioInstallation>>.Run(DiscoverInstallations);
 		}
 
-		private static IVisualStudioInstallation[] DiscoverInstallations()
+		private static Dictionary<string, IVisualStudioInstallation> DiscoverInstallations()
 		{
 			try
 			{
 				return Discovery
 					.GetVisualStudioInstallations()
-					.ToArray();
+					.ToDictionary(i => Path.GetFullPath(i.Path), i => i);
 			}
 			catch (Exception ex)
 			{
 				Debug.LogError($"Error detecting Visual Studio installations: {ex}");
-				return Array.Empty<IVisualStudioInstallation>();
+				return new Dictionary<string, IVisualStudioInstallation>();
 			}
 		}
 
@@ -73,27 +76,20 @@ public void Initialize(string editorInstallationPath)
 		{
 		}
 
-		internal virtual bool TryGetVisualStudioInstallationForPath(string editorPath, bool searchInstallations, out IVisualStudioInstallation installation)
+		internal virtual bool TryGetVisualStudioInstallationForPath(string editorPath, bool lookupDiscoveredInstallations, out IVisualStudioInstallation installation)
 		{
-			if (searchInstallations)
-			{
-				// lookup for well known installations
-				foreach (var candidate in _discoverInstallations.Result)
-				{
-					if (!string.Equals(Path.GetFullPath(editorPath), Path.GetFullPath(candidate.Path), StringComparison.OrdinalIgnoreCase))
-						continue;
+			editorPath = Path.GetFullPath(editorPath);
 
-					installation = candidate;
-					return true;
-				}
-			}
+			// lookup for well known installations
+			if (lookupDiscoveredInstallations && _discoverInstallations.Result.TryGetValue(editorPath, out installation))
+				return true;
 
 			return Discovery.TryDiscoverInstallation(editorPath, out installation);
 		}
 
 		public virtual bool TryGetInstallationForPath(string editorPath, out CodeEditor.Installation installation)
 		{
-			var result = TryGetVisualStudioInstallationForPath(editorPath, searchInstallations: false, out var vsi);
+			var result = TryGetVisualStudioInstallationForPath(editorPath, lookupDiscoveredInstallations: false, out var vsi);
 			installation = vsi?.ToCodeEditorInstallation() ?? default;
 			return result;
 		}