cleanup

HJLebbink · Mar 7, 2016 · f425c4f · f425c4f
1 parent b8245ab
commit f425c4f
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 41 deletions.
diff --git a/CSHARP/AsmDoc/AsmDocClassifier.cs b/CSHARP/AsmDoc/AsmDocClassifier.cs
@@ -8,7 +8,7 @@
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Tagging;
 
-namespace AsmDude.GoToDoc {
+namespace AsmDude.AsmDoc {
 
     #region Classification type/format exports
 

diff --git a/CSHARP/AsmDoc/AsmDocMouseHandler.cs b/CSHARP/AsmDoc/AsmDocMouseHandler.cs
@@ -1,10 +1,8 @@
 using System;
 using System.ComponentModel.Composition;
-using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Input;
 using Microsoft.VisualStudio;
-using Microsoft.VisualStudio.Editor;
 using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Text;
@@ -15,12 +13,9 @@
 using Microsoft.VisualStudio.Shell;
 using System.Diagnostics;
 using System.Globalization;
-using AsmDude;
-using System.Reflection;
 using EnvDTE80;
-using System.IO;
 
-namespace AsmDude.GoToDoc {
+namespace AsmDude.AsmDoc {
 
     [Export(typeof(IKeyProcessorProvider))]
     // [TextViewRole(PredefinedTextViewRoles.Document)]
@@ -272,12 +267,9 @@ bool TryHighlightItemUnderMouse(Point position) {
                 //  check for valid classification type.
                 foreach (var classification in _aggregator.GetClassificationSpans(extent.Span)) {
                     string keyword = classification.Span.GetText();
-                    string type = classification.ClassificationType.Classification.ToLower();
+                    //string type = classification.ClassificationType.Classification.ToLower();
                     string url = this.getUrl(keyword);
-                    Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "INFO: {0}:TryHighlightItemUnderMouse: keyword={1}; type={2}; url={3}", this.ToString(), keyword, type, url));
-
-
-                    //if ((type.Equals("mnemonic") || type.Equals("jump")) && SetHighlightSpan(classification.Span)) {
+                    //Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "INFO: {0}:TryHighlightItemUnderMouse: keyword={1}; type={2}; url={3}", this.ToString(), keyword, type, url));
                     if ((url != null) && SetHighlightSpan(classification.Span)) {
                         updated = true;
                         return true;

diff --git a/CSHARP/AsmDude.csproj b/CSHARP/AsmDude.csproj
@@ -5,8 +5,6 @@
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -291,6 +289,9 @@
       <Generator>PublicSettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <None Include="Resources\AsmDudeData.xsd">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -312,13 +313,5 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="packages\Microsoft.VisualStudio.SDK.VsixSuppression.14.0.50420-pre\build\Microsoft.VisualStudio.SDK.VsixSuppression.targets" Condition="Exists('packages\Microsoft.VisualStudio.SDK.VsixSuppression.14.0.50420-pre\build\Microsoft.VisualStudio.SDK.VsixSuppression.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('packages\Microsoft.VisualStudio.SDK.VsixSuppression.14.0.50420-pre\build\Microsoft.VisualStudio.SDK.VsixSuppression.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VisualStudio.SDK.VsixSuppression.14.0.50420-pre\build\Microsoft.VisualStudio.SDK.VsixSuppression.targets'))" />
-    <Error Condition="!Exists('packages\Microsoft.VSSDK.BuildTools.14.0.22823-RC-Updated\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.BuildTools.14.0.22823-RC-Updated\build\Microsoft.VSSDK.BuildTools.props'))" />
-    <Error Condition="!Exists('packages\Microsoft.VSSDK.BuildTools.14.0.22823-RC-Updated\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.BuildTools.14.0.22823-RC-Updated\build\Microsoft.VSSDK.BuildTools.targets'))" />
-  </Target>
   <Import Project="packages\Microsoft.VSSDK.BuildTools.14.0.22823-RC-Updated\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('packages\Microsoft.VSSDK.BuildTools.14.0.22823-RC-Updated\build\Microsoft.VSSDK.BuildTools.targets')" />
 </Project>
diff --git a/CSHARP/AsmDudeTools.cs b/CSHARP/AsmDudeTools.cs
@@ -84,7 +84,7 @@ public string getUrl(string keyword) {
                 Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "WARNING: {0}:getUrl: multiple elements for keyword {1}.", this.ToString(), keywordUpper));
             }
             if (all.Count == 0) {
-                Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "INFO: {0}:getUrl: no elements for keyword {1}.", this.ToString(), keywordUpper));
+                //Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "INFO: {0}:getUrl: no elements for keyword {1}.", this.ToString(), keywordUpper));
                 return null;
             } else {
                 XmlNode node1 = all.Item(0);

diff --git a/CSHARP/CodeCompletion/AsmCompletionSource.cs b/CSHARP/CodeCompletion/AsmCompletionSource.cs
@@ -32,7 +32,6 @@
 using Microsoft.VisualStudio.Text;
 using System.Windows;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 using System.Globalization;
 
 namespace AsmDude {

diff --git a/CSHARP/CodeFolding/CodeFoldingTagger.cs b/CSHARP/CodeFolding/CodeFoldingTagger.cs
@@ -26,7 +26,7 @@
 using Microsoft.VisualStudio.Text.Tagging;
 using Microsoft.VisualStudio.Text;
 
-namespace AsmDude {
+namespace AsmDude.CodeFolding {
 
     internal sealed class CodeFoldingTagger : ITagger<IOutliningRegionTag> {
 

diff --git a/CSHARP/CodeFolding/CodeFoldingTaggerProvider.cs b/CSHARP/CodeFolding/CodeFoldingTaggerProvider.cs
@@ -26,7 +26,7 @@
 using System;
 using System.ComponentModel.Composition;
 
-namespace AsmDude.HighlightWord {
+namespace AsmDude.CodeFolding {
 
     /// <summary>
     /// Export a <see cref="IViewTaggerProvider"/>

diff --git a/CSHARP/HighlightWord/HighlightWordTagger.cs b/CSHARP/HighlightWord/HighlightWordTagger.cs
@@ -29,7 +29,7 @@
 using Microsoft.VisualStudio.Text.Operations;
 using Microsoft.VisualStudio.Text.Tagging;
 
-namespace AsmDude {
+namespace AsmDude.HighlightWord {
 
     /// <summary>
     /// Derive from TextMarkerTag, in case anyone wants to consume

diff --git a/CSHARP/HighlightWord/HighlightWordTaggerProvider.cs b/CSHARP/HighlightWord/HighlightWordTaggerProvider.cs
@@ -32,16 +32,14 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AsmDude.HighlightWord
-{
+namespace AsmDude.HighlightWord {
     /// <summary>
     /// Export a <see cref="IViewTaggerProvider"/>
     /// </summary>
     [Export(typeof(IViewTaggerProvider))]
     [ContentType("text")]
     [TagType(typeof(HighlightWordTag))]
-    public class HighlightWordTaggerProvider : IViewTaggerProvider
-    {
+    public class HighlightWordTaggerProvider : IViewTaggerProvider {
         [Import]
         internal ITextSearchService TextSearchService { get; set; }
 
@@ -55,8 +53,7 @@ public class HighlightWordTaggerProvider : IViewTaggerProvider
         /// <param name="textView"> The text view we are creating a tagger for</param>
         /// <param name="buffer"> The buffer that the tagger will examine for instances of the current word</param>
         /// <returns> Returns a HighlightWordTagger instance</returns>
-        public ITagger<T> CreateTagger<T>(ITextView textView, ITextBuffer buffer) where T : ITag
-        {
+        public ITagger<T> CreateTagger<T>(ITextView textView, ITextBuffer buffer) where T : ITag {
             // Only provide highlighting on the top-level buffer
             if (textView.TextBuffer != buffer)
                 return null;

diff --git a/CSHARP/QuickInfo/AsmQuickInfoController.cs b/CSHARP/QuickInfo/AsmQuickInfoController.cs
@@ -20,15 +20,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using System;
 using System.Collections.Generic;
-using System.Windows.Input;
 using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Utilities;
 
-namespace AsmDude {
+namespace AsmDude.QuickInfo {
 
     internal class AsmQuickInfoController : IIntellisenseController {
 

diff --git a/CSHARP/QuickInfo/AsmQuickInfoControllerProvider.cs b/CSHARP/QuickInfo/AsmQuickInfoControllerProvider.cs
@@ -27,7 +27,7 @@
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Utilities;
 
-namespace AsmDude {
+namespace AsmDude.QuickInfo {
 
     [Export(typeof(IIntellisenseControllerProvider))]
     [Name("Template QuickInfo Controller")]

diff --git a/CSHARP/QuickInfo/AsmQuickInfoSource.cs b/CSHARP/QuickInfo/AsmQuickInfoSource.cs
@@ -32,7 +32,7 @@
 using System.Windows;
 using System.ComponentModel.Composition;
 
-namespace AsmDude {
+namespace AsmDude.QuickInfo {
 
     /// <summary>
     /// Provides QuickInfo information to be displayed in a text buffer

diff --git a/CSHARP/QuickInfo/AsmQuickInfoSourceProvider.cs b/CSHARP/QuickInfo/AsmQuickInfoSourceProvider.cs
@@ -26,7 +26,7 @@
 using Microsoft.VisualStudio.Utilities;
 using System.ComponentModel.Composition;
 
-namespace AsmDude {
+namespace AsmDude.QuickInfo {
 
     /// <summary>
     /// Factory for quick info sources

diff --git a/CSHARP/AsmDudeData.xsd → CSHARP/Resources/AsmDudeData.xsd b/CSHARP/AsmDudeData.xsd → CSHARP/Resources/AsmDudeData.xsd
diff --git a/CSHARP/source.extension.vsixmanifest b/CSHARP/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011">
   <Metadata>
-    <Identity Id="c729d6b2-f412-49ed-893d-a8f61f25db98" Version="1.4.1" Language="en-US" Publisher="H.J. Lebbink" />
+    <Identity Id="c729d6b2-f412-49ed-893d-a8f61f25db98" Version="1.4.2" Language="en-US" Publisher="H.J. Lebbink" />
     <DisplayName>AsmDude</DisplayName>
     <Description xml:space="preserve">Syntax highlighting, code completion and folding for assembly source code</Description>
     <MoreInfo>https://github.com/HJLebbink/asm-dude</MoreInfo>