fix icons

Author: jacob-ronstadt

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/CodeQL.VisualStudio.csproj

@@ -153,8 +153,6 @@
     <Content Include="icon.png" />
     <Resource Include="Icons\db.ico" />
     <Resource Include="Icons\Gear.ico" />
-    <Resource Include="Icons\magnify.ico" />
-    <Resource Include="Icons\refresh.ico" />
     <Resource Include="Icons\stop.ico" />
     <Resource Include="Icons\analyze.ico" />
     <Resource Include="Icons\select.ico" />

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/CodeQLPackage.vsct

@@ -104,12 +104,12 @@
 
 	    <Button guid="guidCodeQLCmdSet" id="cmdiCodeQLLoadQueriesCommand" priority="0x0122" type="Button">
 			<Parent guid="guidCodeQLCmdSet" id="CodeQLSubMenuGroup" />
-			<Icon guid="IconRefresh" id="IconRefresh16" />
+			<Icon guid="IconSelect" id="IconSelect16" />
 		    <Strings>
 			    <CommandName>cmdiCodeQLLoadQueriesCommand</CommandName>
-			    <ButtonText>Select Available Query</ButtonText>
-			    <MenuText>Select Available Query</MenuText>
-			    <ToolTipText>Search for all locally available queries and select which to run</ToolTipText>
+			    <ButtonText>Select Available CodeQL Query Suites</ButtonText>
+			    <MenuText>Select Available CodeQL Query Suites</MenuText>
+			    <ToolTipText>Search for all locally available CodeQL query suites and select which to run</ToolTipText>
 		    </Strings>
 	    </Button>
 
@@ -150,9 +150,9 @@
 			<Icon guid="IconSelect" id="IconSelect16" />
 			<Strings>
 				<CommandName>cmdiCodeQLLoadQueriesCommand</CommandName>
-				<ButtonText>Select Available Queries</ButtonText>
-				<MenuText>Select Available Queries</MenuText>
-				<ToolTipText>Select locally available queries to run</ToolTipText>
+				<ButtonText>Select Available CodeQL Suites</ButtonText>
+				<MenuText>Select Available CodeQL Suites</MenuText>
+				<ToolTipText>Select Locally Available CodeQL Query Suites to Run</ToolTipText>
 			</Strings>
 		</Button>
 		<Button guid="guidCodeQLCmdSet" id="cmdidCodeQLStopCommand" priority="0x0133" type="Button">
@@ -175,7 +175,6 @@
         inside a button definition. An important aspect of this declaration is that the element id 
         must be the actual index (1-based) of the bitmap inside the bitmap strip. -->
 		<Bitmap guid="IconAnalyze" href="Icons\\analyze.ico" usedList="IconAnalyze16"/>
-		<Bitmap guid="IconRefresh" href="Icons\\refresh.ico" usedList="IconRefresh16"/>
 		<Bitmap guid="IconStop" href="Icons\\stop.ico" usedList="IconStop16"/>
 		<Bitmap guid="IconSelect" href="Icons\\select.ico" usedList="IconSelect16"/>
 		<Bitmap guid="IconGear" href="Icons\\Gear.ico" usedList="IconGear48"/>
@@ -211,10 +210,6 @@
 		  <IDSymbol name="IconAnalyze16" value="1" />
 	  </GuidSymbol>
 
-	  <GuidSymbol name="IconRefresh" value="{FFA9D4AC-7B75-4117-AB06-D3D38E3B4388}">
-		  <IDSymbol name="IconRefresh16" value="1"/>
-	  </GuidSymbol>
-	  
 	  <GuidSymbol name="IconStop" value="{7A6F12D2-D2BE-47FD-8B42-BDE56E0C03ED}">
 		  <IDSymbol name="IconStop16" value="1"/>
 	  </GuidSymbol>

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/CodeQLRunner.cs

@@ -378,7 +378,7 @@ public async Task<List<string>> FindQueriesAsync(string qlpack, bool queriesNSui
                     string query = line.Replace("\"", string.Empty).Replace("\\\\", "/").Replace("\\", "/").Trim(',').Trim();
                     if (!IsExclusion(query))
                     {
-                        queries.Add(query);
+                        queries.Add(query.Substring(query.IndexOf("packages"))); // display packages from root of pack, not from root of filesystem
                     }
                 }
             }

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/CodeQLService.cs

@@ -176,102 +176,14 @@ public async Task CancelIfRunningAsync()
             }
             await ProjectHelper.HideProgressAsync();
         }
-        private void HandleKeyCollision(string existingKey, string newValue)
-        {
-            if (_queryDict[existingKey].Equals(newValue))
-            {
-                return;
-            }
-            StringBuilder replacementKey = new StringBuilder();
-            StringBuilder newValueKey = new StringBuilder();
-            List<string> existingValueParts = _queryDict[existingKey].Split('/').ToList();
-            List<string> newValueParts = newValue.Split('/').ToList();
-            while ((existingValueParts.Count > 0 && newValueParts.Count > 0) && 
-                existingValueParts.Last().Equals(newValueParts.Last()))
-            {
-                replacementKey.Insert(0, "/" + existingValueParts.Last() );
-                existingValueParts.RemoveAt(existingValueParts.Count - 1);
-                newValueKey.Insert(0, "/" + newValueParts.Last());
-                newValueParts.RemoveAt(newValueParts.Count - 1); 
-            }
-
-            // add remaining unique value
-            if (newValueParts.Count > 0 && existingValueParts.Count > 0) {
-                newValueKey.Insert(0, newValueParts.Last());
-                replacementKey.Insert(0, existingValueParts.Last());
-
-                // if at a version, try to get the qlpack for it which should be the preceding two segments
-                if(Version.TryParse(newValueParts.Last(), out _) && newValueParts.Count > 2)
-                {
-                    newValueKey.Insert(0, newValueParts.ElementAt(newValueParts.Count - 3) +"/" + 
-                        newValueParts.ElementAt(newValueParts.Count - 2) + "/");
-                }
-                if (Version.TryParse(existingValueParts.Last(), out _) && existingValueParts.Count > 2)
-                {
-                    replacementKey.Insert(0, existingValueParts.ElementAt(existingValueParts.Count - 2) + "/" + 
-                        existingValueParts.ElementAt(existingValueParts.Count - 2) + "/");
-                }
-            }
-            else
-            {
-                throw new Exception("Unable to find new key");
-            }
-
-            if (newValueKey.ToString().Equals(replacementKey.ToString()))
-            {
-                throw new Exception("Unable to find new key");
-            }
-            _queryDict.Remove(existingKey);
-            if (!_queryDict.ContainsKey(replacementKey.ToString()))
-            {
-                _queryDict.Add(replacementKey.ToString(), string.Join("/", existingValueParts));
-            }
-            if (!_queryDict.ContainsKey(replacementKey.ToString()))
-            {
-                _queryDict.Add(newValueKey.ToString(), newValue);
-            }
-        }
-
+      
         public async Task<ObservableCollection<string>> FindAvailableQueriesAsync()
         {
             List<string> packList = await CodeQLRunner.Instance.FindPacksAsync(CodeQLGeneralOptions.Instance.AdditionalQueryLocations);
             List<string> queryList = await CodeQLRunner.Instance.FindQueriesAsync(packList, queriesNSuites: false);
-            foreach (string query in queryList)
-            {
-                string key = query.Replace("\\", "/").Split('/').Last();
-                if (_queryDict.ContainsKey(key))
-                {
-                    HandleKeyCollision(key, query);
-                }
-                else
-                {
-                    _queryDict.Add(key, query.Replace("\\", "/"));
-                }
-            }
-
-            return new ObservableCollection<string>(_queryDict.Keys);
+            return new ObservableCollection<string>(queryList.ToHashSet());
         }
 
-        public void AddAdditionalQueries(List<string> queries)
-        {
-            foreach (string query in queries)
-            {
-                string key = query.Replace("\\", "/").Split('/').Last();
-                if (!_queryDict.ContainsKey(key))
-                {
-                    _queryDict.Add(key, query.Replace("\\", "/"));
-                }
-            }
-        }
-
-        public void RemoveQuery(string query)
-        {
-            string key = query.Replace("\\", "/").Split('/').Last();
-            if (_queryDict.ContainsKey(key))
-            {
-                _queryDict.Remove(key);
-            }
-        }
 
         public async Task UpdateDatabaseBuildInfoAsync()
         {