Merge pull request #156 from tomasr/develop

v3.2 release

Author: tomasr

src/Viasfora.Core/Constants.cs

@@ -14,19 +14,6 @@ public static class Constants {
 
     public const String OBFUSCATED_TEXT = "viasfora.text.obfuscated";
 
-    public const String CT_XML = "XML";
-    public const String CT_XAML = "XAML";
-    public const String CT_HTML = "HTML";
-    // VS213 HTML Editor
-    public const String CT_HTMLX = "htmlx";
-    public const String XML_CLOSING = "XMLCloseTag";
-    public const String XML_PREFIX = "XMLPrefix";
-    public const String XML_CLOSING_PREFIX = "viasfora.xml.closing.prefix";
-    public const String RAZOR_CLOSING = "viasfora.razor.closing.element";
-    // I'd prefer "XML Delimiter" here, but no way to
-    // use it effectively.
-    public const String DELIMITER = PredefinedClassificationTypeNames.Operator;
-
     public const String STRING_COLLECTION_EDITOR = "System.Windows.Forms.Design.StringCollectionEditor, System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
     public static int S_OK = 0;
 

src/Viasfora.Core/Text/CurrentColumnAdornmentFactory.cs

@@ -8,7 +8,7 @@ namespace Winterdom.Viasfora.Text {
 
   [Export(typeof(IWpfTextViewCreationListener))]
   [ContentType(ContentTypes.Text)]
-  [TextViewRole(PredefinedTextViewRoles.Interactive)]
+  [TextViewRole(PredefinedTextViewRoles.Editable)]
   internal sealed class CurrentColumnAdornmentFactory : IWpfTextViewCreationListener {
     [Import]
     public IClassificationTypeRegistryService ClassificationRegistry = null;

src/Viasfora.Core/Text/CurrentLineAdornmentFactory.cs

@@ -8,7 +8,7 @@ namespace Winterdom.Viasfora.Text {
 
   [Export(typeof(IWpfTextViewCreationListener))]
   [ContentType(ContentTypes.Text)]
-  [TextViewRole(PredefinedTextViewRoles.Interactive)]
+  [TextViewRole(PredefinedTextViewRoles.Editable)]
   internal sealed class CurrentLineAdornmentFactory : IWpfTextViewCreationListener {
     [Import]
     public IClassificationTypeRegistryService ClassificationRegistry = null;

src/Viasfora.Languages/BraceScanners/CSharpBraceScanner.cs

@@ -213,6 +213,9 @@ private bool ParseInterpolatedString(ITextChars tc, ref CharPos pos) {
             pos = new CharPos(tc.Char(), tc.AbsolutePosition, EncodedState());
             tc.Next();
             return true;
+          } else if ( this.multiLine && tc.Char() == '"' && tc.NChar() == '"' ) {
+            // single embedded double quote
+            tc.Skip(2);
           } else if ( tc.Char() == '"' ) {
             // done parsing the interpolated string
             this.status = stText;

src/Viasfora.Languages/CBasedLanguage.cs

@@ -9,11 +9,9 @@ public abstract class CBasedLanguage : LanguageInfo {
 
     public CBasedLanguage(IVsfSettings settings) : base(settings) {
     }
-    protected override IBraceScanner NewBraceScanner() {
-      return new CBraceScanner();
-    }
-    public override IStringScanner NewStringScanner(String text) {
-      return new BasicCStringScanner(text);
-    }
+    protected override IBraceScanner NewBraceScanner()
+      => new CBraceScanner();
+    public override IStringScanner NewStringScanner(String text)
+      => new BasicCStringScanner(text);
   }
 }

src/Viasfora.Languages/CSharp.cs

@@ -23,28 +23,17 @@ public class CSharp : CBasedLanguage {
     static readonly String[] CS_VIS_KEYWORDS = {
          "public", "private", "protected", "internal"
       };
-    protected override String[] ControlFlowDefaults {
-      get { return CS_KEYWORDS; }
-    }
-    protected override String[] LinqDefaults {
-      get { return CS_LINQ_KEYWORDS; }
-    }
-    protected override String[] VisibilityDefaults {
-      get { return CS_VIS_KEYWORDS; }
-    }
-    public override String KeyName {
-      get { return Constants.CSharp; }
-    }
-    protected override String[] SupportedContentTypes {
-      get { return new String[] { ContentType }; }
-    }
+    protected override String[] ControlFlowDefaults => CS_KEYWORDS;
+    protected override String[] LinqDefaults => CS_LINQ_KEYWORDS;
+    protected override String[] VisibilityDefaults => CS_VIS_KEYWORDS;
+    public override String KeyName => Constants.CSharp;
+    protected override String[] SupportedContentTypes
+      => new String[] { ContentType };
 
-    protected override IBraceScanner NewBraceScanner() {
-      return new CSharpBraceScanner();
-    }
-    public override IStringScanner NewStringScanner(string text) {
-      return new CSharpStringScanner(text);
-    }
+    protected override IBraceScanner NewBraceScanner()
+      => new CSharpBraceScanner();
+    public override IStringScanner NewStringScanner(string text)
+      => new CSharpStringScanner(text);
 
     [ImportingConstructor]
     public CSharp(IVsfSettings settings) : base(settings) {

src/Viasfora.Languages/Cpp.cs

@@ -15,28 +15,19 @@ class Cpp : CBasedLanguage {
     static readonly String[] CPP_VIS_KEYWORDS = {
          "public", "private", "protected", "internal", "friend"
       };
-    protected override String[] ControlFlowDefaults {
-      get { return CPP_KEYWORDS; }
-    }
-    protected override String[] LinqDefaults {
-      get { return new String[0]; }
-    }
-    protected override String[] VisibilityDefaults {
-      get { return CPP_VIS_KEYWORDS; }
-    }
-    public override String KeyName {
-      get { return Constants.Cpp; }
-    }
-    protected override String[] SupportedContentTypes {
-      get { return new String[] { ContentType }; }
-    }
+    protected override String[] ControlFlowDefaults => CPP_KEYWORDS;
+    protected override String[] LinqDefaults => EMPTY;
+    protected override String[] VisibilityDefaults => CPP_VIS_KEYWORDS;
+    public override String KeyName => Constants.Cpp;
+
+    protected override String[] SupportedContentTypes
+      => new String[] { ContentType };
 
     [ImportingConstructor]
     public Cpp(IVsfSettings settings) : base(settings) {
     }
 
-    public override IStringScanner NewStringScanner(string text) {
-      return new CStringScanner(text);
-    }
+    public override IStringScanner NewStringScanner(string text)
+      => new CStringScanner(text);
   }
 }

src/Viasfora.Languages/Css.cs

@@ -13,31 +13,22 @@ public class Css : LanguageInfo {
     public const String SassContentType = "SCSS";
     public const String LessContentType = "LESS";
 
-    public override String KeyName {
-      get { return Constants.Css; }
-    }
+    public override String KeyName => Constants.Css;
+
     protected override String[] SupportedContentTypes {
       get { return new String[] { ContentType, SassContentType, LessContentType }; }
     }
-    protected override String[] ControlFlowDefaults {
-      get { return EMPTY; }
-    }
-    protected override String[] LinqDefaults {
-      get { return EMPTY; }
-    }
-    protected override String[] VisibilityDefaults {
-      get { return EMPTY; }
-    }
+    protected override String[] ControlFlowDefaults => EMPTY;
+    protected override String[] LinqDefaults => EMPTY;
+    protected override String[] VisibilityDefaults => EMPTY;
 
     [ImportingConstructor]
     public Css(IVsfSettings settings) : base(settings) {
     }
 
-    public override IStringScanner NewStringScanner(string text) {
-      return new CssStringScanner(text);
-    }
-    protected override IBraceScanner NewBraceScanner() {
-      return new CssBraceScanner();
-    }
+    public override IStringScanner NewStringScanner(string text)
+      => new CssStringScanner(text);
+    protected override IBraceScanner NewBraceScanner()
+      => new CssBraceScanner();
   }
 }

src/Viasfora.Languages/DefaultLanguage.cs

@@ -7,40 +7,21 @@
 
 namespace Winterdom.Viasfora.Languages {
   public class DefaultLanguage : LanguageInfo {
-    static readonly String[] empty = new String[0];
-    protected override String[] ControlFlowDefaults {
-      get { return empty; }
-    }
-    protected override String[] LinqDefaults {
-      get { return empty; }
-    }
-    protected override String[] VisibilityDefaults {
-      get { return empty; }
-    }
+    protected override String[] ControlFlowDefaults => EMPTY;
+    protected override String[] LinqDefaults => EMPTY;
+    protected override String[] VisibilityDefaults => EMPTY;
 
-    protected override string[] SupportedContentTypes {
-      get { return empty; }
-    }
-    public override string KeyName {
-      get { return "Text"; }
-    }
+    protected override string[] SupportedContentTypes => EMPTY;
+    public override string KeyName => "Text";
 
     [ImportingConstructor]
     public DefaultLanguage(IVsfSettings settings) : base(settings) {
     }
 
-
     public override bool MatchesContentType(IContentType contentType) {
       return true;
     }
-    protected override IBraceScanner NewBraceScanner() {
-      return new DefaultBraceScanner();
-    }
-
-    private class NoFirstLineCommentParser : IFirstLineCommentParser {
-      public string Parse(ITextChars tc) {
-        return "";
-      }
-    }
+    protected override IBraceScanner NewBraceScanner()
+      => new DefaultBraceScanner();
   }
 }

src/Viasfora.Languages/FSharp.cs

@@ -21,31 +21,20 @@ public class FSharp : LanguageInfo {
     static readonly String[] VIS_KEYWORDS = {
          "public", "private", "internal"
       };
-    protected override String[] ControlFlowDefaults {
-      get { return KEYWORDS; }
-    }
-    protected override String[] LinqDefaults {
-      get { return LINQ_KEYWORDS; }
-    }
-    protected override String[] VisibilityDefaults {
-      get { return VIS_KEYWORDS; }
-    }
-    public override String KeyName {
-      get { return Constants.FSharp; }
-    }
-    protected override String[] SupportedContentTypes {
-      get { return new String[] { ContentType }; }
-    }
+    protected override String[] ControlFlowDefaults => KEYWORDS;
+    protected override String[] LinqDefaults => LINQ_KEYWORDS;
+    protected override String[] VisibilityDefaults => VIS_KEYWORDS;
+    public override String KeyName => Constants.FSharp;
+    protected override String[] SupportedContentTypes
+      => new String[] { ContentType };
 
     [ImportingConstructor]
     public FSharp(IVsfSettings settings) : base(settings) {
     }
 
-    protected override IBraceScanner NewBraceScanner() {
-      return new FSharpBraceScanner();
-    }
-    public override IStringScanner NewStringScanner(String text) {
-      return new FSharpStringScanner(text);
-    }
+    protected override IBraceScanner NewBraceScanner()
+      => new FSharpBraceScanner();
+    public override IStringScanner NewStringScanner(String text)
+      => new FSharpStringScanner(text);
   }
 }