Merge branch 'develop'

README.md

@@ -73,6 +73,7 @@ Most features include support for the following languages
 * S
 * R
 * HLSL
+* Fortran
 
 # Building
 Visual Studio 2017 is needed for building from source.

src/Viasfora.Core/Contracts/IVsFeatures.cs

@@ -0,0 +1,7 @@
+using System;
+
+namespace Winterdom.Viasfora.Contracts {
+  public interface IVsFeatures {
+    bool IsSupported(String featureName);
+  }
+}

src/Viasfora.Core/KnownFeatures.cs

@@ -0,0 +1,7 @@
+using System;
+
+namespace Winterdom.Viasfora {
+  public static class KnownFeatures {
+    public const String TooltipApi = nameof(TooltipApi);
+  }
+}

src/Viasfora.Core/Util/VsFeatures.cs

@@ -0,0 +1,23 @@
+using Microsoft.VisualStudio.Language.Intellisense;
+using System;
+using System.ComponentModel.Composition;
+using Winterdom.Viasfora.Contracts;
+
+namespace Winterdom.Viasfora.Util {
+  [Export(typeof(IVsFeatures))]
+  public class VsFeatures : IVsFeatures {
+    public bool IsSupported(string featureName) {
+      switch ( featureName ) {
+        case KnownFeatures.TooltipApi:
+          return IsQuickInfoSourceDeprecated();
+      }
+      throw new InvalidOperationException("Unknown feature: " + featureName);
+    }
+
+    private bool IsQuickInfoSourceDeprecated() {
+      return typeof(IQuickInfoSource)
+            .GetCustomAttributes(typeof(ObsoleteAttribute), false)
+            .Length > 0;
+    }
+  }
+}

src/Viasfora.Core/Viasfora.Core.csproj

@@ -158,6 +158,7 @@
     <Compile Include="Contracts\ILogger.cs" />
     <Compile Include="Contracts\IPackageUserOptions.cs" />
     <Compile Include="Contracts\IPresentationModeState.cs" />
+    <Compile Include="Contracts\IVsFeatures.cs" />
     <Compile Include="Contracts\IVsfTelemetry.cs" />
     <Compile Include="DefaultNames.cs" />
     <Compile Include="Design\NativeMethods.cs" />
@@ -182,6 +183,7 @@
     <Compile Include="IUpdatableSettings.cs" />
     <Compile Include="IVsfSettings.cs" />
     <Compile Include="JsonExtensions.cs" />
+    <Compile Include="KnownFeatures.cs" />
     <Compile Include="LanguageExtensions.cs" />
     <Compile Include="Margins\DevMarginProvider.cs" />
     <Compile Include="Margins\DevMarginViewModel.cs" />
@@ -263,6 +265,7 @@
     <Compile Include="Util\StringChars.cs" />
     <Compile Include="Util\StringPart.cs" />
     <Compile Include="Util\VsColors.cs" />
+    <Compile Include="Util\VsFeatures.cs" />
     <Compile Include="VsSolution.cs" />
     <Compile Include="XLangSupport\FakeContentTypeDefinition.cs" />
     <Compile Include="XLangSupport\XLangTextViewCreationListener.cs" />

src/Viasfora.Languages/BraceScanners/CBraceScanner.cs

@@ -47,8 +47,8 @@ private bool ParseText(ITextChars tc, ref CharPos pos) {
           this.status = stString;
           tc.Next();
           this.ParseString(tc);
-        } else if ( Char.IsDigit(tc.Char()) && tc.NChar() == '\'' ) {
-          // this is a C++ 14 digit separator, such as 1'000'000
+        } else if ( IsHexDigit(tc.Char()) && tc.NChar() == '\'' ) {
+          // this is a C++ 14 digit separator, such as 1'000'000 or 0xFFFF'0000
           tc.Skip(2);
         } else if ( tc.Char() == '\'' ) {
           this.status = stString;
@@ -106,5 +106,11 @@ private void ParseMultiLineComment(ITextChars tc) {
         }
       }
     }
+
+    private static bool IsHexDigit(char c) {
+      return Char.IsDigit(c)
+          || (c >= 'a' && c <= 'f')
+          || (c >= 'A' && c <= 'F');
+    }
   }
 }

src/Viasfora.Rainbow/RainbowToolTipSource.cs

@@ -54,6 +54,16 @@ public void AugmentQuickInfoSession(IQuickInfoSession session, IList<object> qui
       if ( IsTooClose(triggerPoint.Value, otherBrace.Value) ) {
         return;
       }
+
+      // IQuickInfoSession.Dismissed is never firing in VS2017 15.6
+      // so if the tooltip window still exists, kill it
+      // and hope to god leaving IQuickInfoSession.Dismissed hooked
+      // up doesn't end up in a memory leak
+      if ( toolTipWindow != null ) {
+        toolTipWindow.Dispose();
+        toolTipWindow = null;
+      }
+
       session.Dismissed += OnSessionDismissed;
 
       if ( toolTipWindow == null ) {

src/Viasfora.Rainbow/Util/ToolTipWindow.cs

@@ -2,10 +2,12 @@
 using System.ComponentModel.Composition;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Formatting;
 using Microsoft.VisualStudio.Utilities;
+using Winterdom.Viasfora.Contracts;
 using Winterdom.Viasfora.Rainbow;
 
 namespace Winterdom.Viasfora.Util {
@@ -15,6 +17,8 @@ public class ToolTipWindowProvider : IToolTipWindowProvider {
     public ITextEditorFactoryService EditorFactory { get; set; }
     [Import]
     public IEditorOptionsFactoryService OptionsFactory { get; set; }
+    [Import]
+    public IVsFeatures VsFeatures { get; set; }
 
     public IToolTipWindow CreateToolTip(ITextView textView) {
       return new ToolTipWindow(textView, this);
@@ -85,7 +89,7 @@ private void ScrollIntoView(SnapshotPoint bufferPosition) {
         return;
       }
       this.tipView.DisplayTextLineContainingBufferPosition(
-        viewPos, this.tipView.LineHeight, ViewRelativePosition.Top
+        viewPos, 2 * this.tipView.LineHeight, ViewRelativePosition.Top
         );
       SetViewportLeft();
       // it could very well be that after this
@@ -139,6 +143,13 @@ private void CreateTipView() {
       options.SetOptionValue(ViewOptions.WordWrapStyleId, WordWrapStyles.None);
       options.SetOptionValue(ViewOptions.ViewProhibitUserInput, true);
 
+      // only for VS2017 15.6 and up, where IIntellisensePresenter is
+      // not supported anymore (replaced by the tooltip APIs), we
+      // set the background to transparent so that it looks like regular
+      // intellisense popup
+      if ( this.provider.VsFeatures.IsSupported(KnownFeatures.TooltipApi) ) {
+        this.tipView.Background = Brushes.Transparent;
+      }
       this.tipView.ViewportWidthChanged += OnViewportWidthChanged;
 
       this.tipView.ZoomLevel = GetSourceZoomFactor() * ZoomFactor * 100;
@@ -183,29 +194,19 @@ private void ReleaseView() {
     // Returning the EditBuffer as the ViewBuffer appears
     // to work around this.
     class TipTextViewModel : ITextViewModel {
-      private ITextView sourceView;
-      private PropertyCollection properties;
 
       public TipTextViewModel(ITextView source) {
-        this.sourceView = source;
-        this.properties = new PropertyCollection();
+        this.DataBuffer = source.TextViewModel.DataBuffer;
+        this.DataModel = source.TextViewModel.DataModel;
+        this.EditBuffer = source.TextViewModel.EditBuffer;
+        this.Properties = new PropertyCollection();
       }
 
-      public ITextBuffer DataBuffer {
-        get { return sourceView.TextViewModel.DataBuffer; }
-      }
-      public ITextDataModel DataModel {
-        get { return sourceView.TextViewModel.DataModel; }
-      }
-      public ITextBuffer EditBuffer {
-        get { return sourceView.TextViewModel.EditBuffer; }
-      }
-      public ITextBuffer VisualBuffer {
-        get { return this.EditBuffer; }
-      }
-      public PropertyCollection Properties {
-        get { return this.properties; }
-      }
+      public ITextBuffer DataBuffer { get; private set; }
+      public ITextDataModel DataModel { get; private set; }
+      public ITextBuffer EditBuffer { get; private set; }
+      public ITextBuffer VisualBuffer => this.EditBuffer;
+      public PropertyCollection Properties { get; private set; }
 
       public SnapshotPoint GetNearestPointInVisualBuffer(SnapshotPoint editBufferPoint) {
         // editBufferPoint MUST be in the editBuffer according to the docs

src/Viasfora.Xml/XmlQuickInfoSource.cs

@@ -11,6 +11,7 @@
 using Microsoft.VisualStudio.Text.Operations;
 using Microsoft.VisualStudio.Text.Tagging;
 using Winterdom.Viasfora.Util;
+using System.Windows.Media;
 
 namespace Winterdom.Viasfora.Xml {
   internal class XmlQuickInfoSource : IQuickInfoSource {
@@ -60,10 +61,7 @@ private UIElement CreateInfoText(String xmlns, String url) {
       });
       // set styles in order to support other 
       // visual studio themes on 2012/2013
-      var brushKey = VsColors.ToolTipBrushKey;
-      if ( brushKey != null ) {
-        textBlock.SetResourceReference(TextBlock.BackgroundProperty, brushKey);
-      }
+      textBlock.Background = Brushes.Transparent;
       textBlock.SetResourceReference(TextBlock.ForegroundProperty, VsColors.ToolTipTextBrushKey);
       hl.SetResourceReference(Hyperlink.ForegroundProperty, VsColors.PanelHyperlinkBrushKey);
       return textBlock;

src/Viasfora/source.extension.vsixmanifest

@@ -4,7 +4,7 @@
                  xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
         <Identity Id="Winterdom.Viasfora.f7a33795-2b40-4125-856c-89b0bd8cd5ab"
-                  Version="3.8"
+                  Version="3.9"
                   Language="en-US"
                   Publisher="Tomas Restrepo" />
         <DisplayName>Viasfora</DisplayName>

tests/Viasfora.Tests/BraceScanners/CBraceScannerTests.cs

@@ -34,6 +34,13 @@ public void CanExtractBracesFollowingCpp14QuoteInIntLiteral() {
       Assert.Equal(4, chars.Count);
     }
     [Fact]
+    public void CanExtractBracesFollowingCpp14QuoteInHexLiteral() {
+      String input = @"if ( x == 0xFF'000 ) { }";
+      var extractor = new CBraceScanner();
+      var chars = Extract(extractor, input.Trim(), 0, 0);
+      Assert.Equal(4, chars.Count);
+    }
+    [Fact]
     public void CanExtractBracesFollowingCpp14QuoteInIntLiteralHex() {
       String input = @"if ( x == 0x80'00 ) { }";
       var extractor = new CBraceScanner();