Updated to 0.9, https, code cleanup, revert error text parsing

aberus · Dec 28, 2018 · 333ea02 · 333ea02
1 parent d63fd06
commit 333ea02
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 57 deletions.
diff --git a/Assets/Logo_128x.png b/Assets/Logo_128x.png
diff --git a/Assets/Preview.png → Assets/Preview_200x.png b/Assets/Preview.png → Assets/Preview_200x.png
diff --git a/Assets/StackOverflow-16.png b/Assets/StackOverflow-16.png
diff --git a/Assets/[email protected] b/Assets/[email protected]
diff --git a/StackOverflowQuickLaunch/Browser.cs b/StackOverflowQuickLaunch/Browser.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using EnvDTE;
+using EnvDTE;
 
 namespace Aberus.StackOverflowQuickLaunch
 {

diff --git a/StackOverflowQuickLaunch/Properties/AssemblyInfo.cs b/StackOverflowQuickLaunch/Properties/AssemblyInfo.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Reflection;
 using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -12,10 +11,10 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Aleksander Berus")]
 [assembly: AssemblyProduct("Stack Overflow Quick Launch Search Provider")]
-[assembly: AssemblyCopyright("Copyright © Aleksander Berus 2014-2018")]
+[assembly: AssemblyCopyright("Copyright © Aleksander Berus 2014-2019")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]   
-[assembly: ComVisible(false)]     
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: NeutralResourcesLanguage("en-US")]
 
@@ -28,8 +27,8 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.8.0.0")]
-[assembly: AssemblyFileVersion("0.8.0.0")]
+[assembly: AssemblyVersion("0.9.0.0")]
+[assembly: AssemblyFileVersion("0.9.0.0")]
 
 
 
diff --git a/StackOverflowQuickLaunch/Resources/StackOverflow-new.ico b/StackOverflowQuickLaunch/Resources/StackOverflow-new.ico
diff --git a/StackOverflowQuickLaunch/Resources/StackOverflow-old.ico b/StackOverflowQuickLaunch/Resources/StackOverflow-old.ico
diff --git a/StackOverflowQuickLaunch/Resources/StackOverflowSearchErrorListCommand.png b/StackOverflowQuickLaunch/Resources/StackOverflowSearchErrorListCommand.png
diff --git a/StackOverflowQuickLaunch/StackOverflowQuickLaunch.csproj b/StackOverflowQuickLaunch/StackOverflowQuickLaunch.csproj
@@ -249,7 +249,6 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Resource Include="Resources\StackOverflowSearchErrorListCommand.png" />
     <VSCTCompile Include="StackOverflowQuickLaunchPackage.vsct">
       <ResourceName>Menus.ctmenu</ResourceName>
     </VSCTCompile>

diff --git a/StackOverflowQuickLaunch/StackOverflowQuickLaunchPackage.cs b/StackOverflowQuickLaunch/StackOverflowQuickLaunchPackage.cs
@@ -20,7 +20,7 @@ namespace Aberus.StackOverflowQuickLaunch
     [PackageRegistration(UseManagedResourcesOnly = true)]
     // This attribute is used to register the information needed to show this package
     // in the Help/About dialog of Visual Studio.
-    [InstalledProductRegistration("#110", "#112", "0.7.0", IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", "0.9.0", IconResourceID = 400)]
     // Declare the package guid
     [Guid(GuidList.guidStackOverflowQuickLaunchQuickLaunchPkgString)]
     // Declare a global search provider supported by this package

diff --git a/StackOverflowQuickLaunch/StackOverflowSearchErrorListCommand.cs b/StackOverflowQuickLaunch/StackOverflowSearchErrorListCommand.cs
@@ -6,12 +6,10 @@
 
 using System;
 using System.ComponentModel.Design;
-using System.Globalization;
 using System.Net;
 using System.Text.RegularExpressions;
 using EnvDTE80;
 using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
 
 namespace Aberus.StackOverflowQuickLaunch
 {
@@ -99,10 +97,10 @@ private void MenuItemCallback(object sender, EventArgs e)
                 if (selected != null && selected.TryGetValue("text", out object text))
                 {
                     string description = (string)text;
-                    description = Regex.Replace(description, "\\s'.*'\\s", " ", RegexOptions.IgnoreCase);
+                    description = Regex.Replace(description, "'.*'", "''", RegexOptions.IgnoreCase);
 
                     string searchQuery = selected.TryGetValue("errorcode", out object code) ? $"{code}: {description}" : description;
-                    string url = "http://stackoverflow.com/search?q=" + WebUtility.UrlEncode(searchQuery);
+                    string url = "https://stackoverflow.com/search?q=" + WebUtility.UrlEncode(searchQuery);
                     Browser.Open(url,
                         ((StackOverflowQuickLaunchPackage)package).OptionPage.OpenInInternalBrowser,
                         ((StackOverflowQuickLaunchPackage)package).OptionPage.OpenInNewTab);

diff --git a/StackOverflowQuickLaunch/StackOverflowSearchItemResult.cs b/StackOverflowQuickLaunch/StackOverflowSearchItemResult.cs
@@ -1,6 +1,4 @@
-using System.Diagnostics;
-using Microsoft.VisualStudio.Shell.Interop;
-using EnvDTE;
+using Microsoft.VisualStudio.Shell.Interop;
 
 namespace Aberus.StackOverflowQuickLaunch
 {

diff --git a/StackOverflowQuickLaunch/StackOverflowSearchResult.cs b/StackOverflowQuickLaunch/StackOverflowSearchResult.cs
@@ -160,8 +160,6 @@ public static T ToEnum<T>(this string value) where T : struct, IConvertible
             return default(T);
         }
 
-
-
         public static readonly DateTime UnixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
 
         /// <summary>

diff --git a/StackOverflowQuickLaunch/StackOverflowSearchTask.cs b/StackOverflowQuickLaunch/StackOverflowSearchTask.cs
@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -56,7 +55,7 @@ protected async override void OnStartSearch()
                         AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
                     }
                 ))
-                using (var response = await client.GetAsync("http://api.stackexchange.com/2.2/search/excerpts?order=desc&pagesize=" + pageSize + "&sort=" + sortQuery + "&site=stackoverflow&q=" + WebUtility.UrlEncode(SearchQuery.SearchString.Trim()), cancellationSource.Token))
+                using (var response = await client.GetAsync("https://api.stackexchange.com/2.2/search/excerpts?order=desc&pagesize=" + pageSize + "&sort=" + sortQuery + "&site=stackoverflow&q=" + WebUtility.UrlEncode(SearchQuery.SearchString.Trim()), cancellationSource.Token))
                 using (var receiveStream = await response.Content.ReadAsStreamAsync())
                 {
                     DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(StackOverflowSearchResult));
@@ -105,7 +104,7 @@ protected async override void OnStartSearch()
                     var itemResult = new StackOverflowSearchItemResult(
                         (results[itemIndex].ItemType == ItemType.Question ? "Q: " : "A: ") + WebUtility.HtmlDecode(results[itemIndex].Title),
                         FormatExcerpt(WebUtility.HtmlDecode(results[itemIndex].Excerpt)).Trim(),
-                        "http://stackoverflow.com/questions/" + results[itemIndex].QuestionId,
+                        "https://stackoverflow.com/questions/" + results[itemIndex].QuestionId,
                         new WinFormsIconUIObject(Resources.StackOverflow),
                         searchProvider);
 
@@ -126,7 +125,7 @@ protected async override void OnStartSearch()
                 SearchCallback.ReportResult(this, 
                     new StackOverflowSearchItemResult("Search Online on Stack Overflow for '" + SearchQuery.SearchString + "'",
                         string.Empty,
-                        "http://stackoverflow.com/search?q=" + WebUtility.UrlEncode(SearchQuery.SearchString.Trim()),
+                        "https://stackoverflow.com/search?q=" + WebUtility.UrlEncode(SearchQuery.SearchString.Trim()),
                         null,
                         searchProvider));
 

diff --git a/StackOverflowQuickLaunch/source.extension.vsixmanifest b/StackOverflowQuickLaunch/source.extension.vsixmanifest
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-  <Metadata>
-    <Identity Id="63E411F1-E531-44E8-8689-16B34600CF25" Version="0.8.0" Language="en-US" Publisher="Aleksander Berus" />
-    <DisplayName>Stack Overflow Quick Launch Search Provider</DisplayName>
-    <Description xml:space="preserve">A Quick Launch search provider for searching Stack Overflow in Visual Studio</Description>
-    <MoreInfo>https://github.com/aberus/StackOverflowQuickLaunch</MoreInfo>
-    <License>License.txt</License>
-    <Icon>Resources\Logo_128x.png</Icon>
-    <PreviewImage>Resources\Preview_200x.png</PreviewImage>
-  </Metadata>
-  <Installation InstalledByMsi="false">
-    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="11.0" />
-    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="12.0" />
-    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="14.0" />
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="12.0" />
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="14.0" />
-    <InstallationTarget Id="Microsoft.VisualStudio.IntegratedShell" Version="14.0" />
-    <InstallationTarget Version="15.0" Id="Microsoft.VisualStudio.Enterprise" />
-    <InstallationTarget Version="15.0" Id="Microsoft.VisualStudio.Pro" />
-    <InstallationTarget Version="15.0" Id="Microsoft.VisualStudio.Community" />
-  </Installation>
-  <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
-    <Dependency Id="Microsoft.VisualStudio.MPF.11.0" DisplayName="Visual Studio MPF 11.0" d:Source="Installed" Version="[11.0,14.0)" />
-  </Dependencies>
-  <Assets>
-    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-  </Assets>
-  <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.26208.0,16.0)" DisplayName="Visual Studio core editor" />
-  </Prerequisites>
+    <Metadata>
+        <Identity Id="63E411F1-E531-44E8-8689-16B34600CF25" Version="0.9.0" Language="en-US" Publisher="Aleksander Berus" />
+        <DisplayName>Stack Overflow Quick Launch Search Provider</DisplayName>
+        <Description xml:space="preserve">A Quick Launch search provider for searching Stack Overflow in Visual Studio</Description>
+        <MoreInfo>https://github.com/aberus/StackOverflowQuickLaunch</MoreInfo>
+        <License>License.txt</License>
+        <Icon>Resources\Logo_128x.png</Icon>
+        <PreviewImage>Resources\Preview_200x.png</PreviewImage>
+    </Metadata>
+    <Installation InstalledByMsi="false">
+        <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="11.0" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="12.0" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="14.0" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="12.0" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="14.0" />
+        <InstallationTarget Id="Microsoft.VisualStudio.IntegratedShell" Version="14.0" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="15.0" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="15.0" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="15.0" />
+    </Installation>
+    <Dependencies>
+        <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+        <Dependency Id="Microsoft.VisualStudio.MPF.11.0" DisplayName="Visual Studio MPF 11.0" d:Source="Installed" Version="[11.0,14.0)" />
+    </Dependencies>
+    <Assets>
+        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+    </Assets>
+    <Prerequisites>
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.26208.0,16.0)" DisplayName="Visual Studio core editor" />
+    </Prerequisites>
 </PackageManifest>
-Original file line number
+Diff line change
@@ Expand Up @@
                 return default(T);
             }
             public static readonly DateTime UnixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
             /// <summary>
@@ Expand Down @@