diff --git a/CSHARP/AsmDoc/AsmDocClassifier.cs b/CSHARP/AsmDoc/AsmDocClassifier.cs
index b3f3dec1..b39d10c2 100644
--- 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
index 39dc1e9a..8bb8100f 100644
--- 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
index 2ab0c658..6fae1741 100644
--- a/CSHARP/AsmDude.csproj
+++ b/CSHARP/AsmDude.csproj
@@ -5,8 +5,6 @@
14.0
14.0
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
-
-
@@ -291,6 +289,9 @@
PublicSettingsSingleFileGenerator
Settings.Designer.cs
+
+ Designer
+
Designer
@@ -312,13 +313,5 @@
-
-
- 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}.
-
-
-
-
-
\ No newline at end of file
diff --git a/CSHARP/AsmDudeTools.cs b/CSHARP/AsmDudeTools.cs
index 42887078..0585ae94 100644
--- 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
index e7b293c7..5773d504 100644
--- 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
index 2624d022..c3adc433 100644
--- 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 {
diff --git a/CSHARP/CodeFolding/CodeFoldingTaggerProvider.cs b/CSHARP/CodeFolding/CodeFoldingTaggerProvider.cs
index 9a329f35..80f75928 100644
--- 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 {
///
/// Export a
diff --git a/CSHARP/HighlightWord/HighlightWordTagger.cs b/CSHARP/HighlightWord/HighlightWordTagger.cs
index cc977c8e..fe9c3dd7 100644
--- 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 {
///
/// Derive from TextMarkerTag, in case anyone wants to consume
diff --git a/CSHARP/HighlightWord/HighlightWordTaggerProvider.cs b/CSHARP/HighlightWord/HighlightWordTaggerProvider.cs
index 006768af..e3b09eb7 100644
--- 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 {
///
/// Export a
///
[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
/// The text view we are creating a tagger for
/// The buffer that the tagger will examine for instances of the current word
/// Returns a HighlightWordTagger instance
- public ITagger CreateTagger(ITextView textView, ITextBuffer buffer) where T : ITag
- {
+ public ITagger CreateTagger(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
index a6d2d900..f59505e6 100644
--- 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
index 58e7e495..5abe88f6 100644
--- 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
index 7c0b6ad7..210af0c1 100644
--- 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 {
///
/// Provides QuickInfo information to be displayed in a text buffer
diff --git a/CSHARP/QuickInfo/AsmQuickInfoSourceProvider.cs b/CSHARP/QuickInfo/AsmQuickInfoSourceProvider.cs
index 6011c45a..89dd085c 100644
--- 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 {
///
/// Factory for quick info sources
diff --git a/CSHARP/AsmDudeData.xsd b/CSHARP/Resources/AsmDudeData.xsd
similarity index 100%
rename from CSHARP/AsmDudeData.xsd
rename to CSHARP/Resources/AsmDudeData.xsd
diff --git a/CSHARP/source.extension.vsixmanifest b/CSHARP/source.extension.vsixmanifest
index af8694b8..b3ea6385 100644
--- a/CSHARP/source.extension.vsixmanifest
+++ b/CSHARP/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
-
+
AsmDude
Syntax highlighting, code completion and folding for assembly source code
https://github.com/HJLebbink/asm-dude