Merge branch 'master' into stable

codecadwallader · Dec 9, 2018 · 3ff9df5 · 3ff9df5
2 parents 43361ef + bd7300f
commit 3ff9df5
Show file tree

Hide file tree

Showing 23 changed files with 209 additions and 66 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,12 +5,23 @@
 These changes have not been released to the Visual Studio marketplace, but (if checked) are available in preview within the [CI build](http://vsixgallery.com/extension/4c82e17d-927e-42d2-8460-b473ac7df316/).
 
 - [ ] Features
+
 - [ ] Fixes
 
 ## Previous Releases
 
 These are the changes to each version that has been released to the Visual Studio marketplace.
 
+## 10.6
+
+**2018-12-09**
+
+- [x] Features
+  - [x] [#582](https://github.com/codecadwallader/codemaid/pull/582) - Digging: New option to show item types (e.g. method return or property type) - thanks [GammaWolf](https://github.com/GammaWolf)!
+  - [x] [#593](https://github.com/codecadwallader/codemaid/pull/593) - Switching: Add .cshtml -> .cshtml.cs to defaults - thanks [derekmckinnon](https://github.com/derekmckinnon)!
+  - [x] [#594](https://github.com/codecadwallader/codemaid/pull/594) - Cleaning: New option to add blank lines before/after single-line fields - thanks [jasonjtyler](https://github.com/jasonjtyler)!
+  - [x] [#604](https://github.com/codecadwallader/codemaid/pull/604) - Turn on VS2019 support - thanks [digovc](https://github.com/digovc)!
+
 ## 10.5
 
 **2018-06-09**

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 Looking to contribute something? **Here's how you can help.**
 
-Please read http://www.codemaid.net/contribute/ for setup and a quick code overview
+Please read http://www.codemaid.net/contribute/ for setup and a quick code overview.
 
 Following these guidelines helps to communicate that you respect the time of
 the developers managing and developing this open source project. In return,
@@ -17,7 +17,7 @@ The issue tracker is the preferred channel for [bug reports](#bug-reports),
 [submitting pull requests](#pull-requests), but please respect the
 following restrictions:
 
-* Please **do not** use the issue tracker for personal support requests.  Stack
+* Please **do not** use the issue tracker for personal support requests. Stack
   Overflow is a better place to get help.
 
 * Please **do not** derail or troll issues. Keep the discussion on topic and
@@ -42,7 +42,7 @@ Guidelines for bug reports:
 
 3. **Isolate the problem** &mdash; ideally create an
    [SSCCE](http://www.sscce.org/) and a live example.
-   Uploading the project on cloud storage (OneDrive, DropBox, et el.)
+   Uploading the project on cloud storage (OneDrive, DropBox, et al.)
    or creating a sample GitHub repository is also helpful.
 
 

diff --git a/CodeMaid.UnitTests/Formatting/XmlFormattingTests.cs b/CodeMaid.UnitTests/Formatting/XmlFormattingTests.cs
@@ -52,6 +52,7 @@ public void XmlFormattingTests_AddSpaceToTagContentWithSelfClosingTag()
 
             Settings.Default.Formatting_CommentXmlSplitSummaryTagToMultipleLines = false;
             Settings.Default.Formatting_CommentXmlSpaceTags = true;
+            Settings.Default.Formatting_CommentXmlSpaceSingleTags = false;
 
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
@@ -68,13 +69,14 @@ public void XmlFormattingTests_AddSpaceToTagContentWithSelfClosingTagMultiline()
 
             Settings.Default.Formatting_CommentXmlSplitSummaryTagToMultipleLines = true;
             Settings.Default.Formatting_CommentXmlSpaceTags = true;
+            Settings.Default.Formatting_CommentXmlSpaceSingleTags = false;
 
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
 
         [TestMethod]
         [TestCategory("Formatting UnitTests")]
-        public void XmlFormattingTests_AddSpaceToTagContentShouldLeaveNoTrailingWhitespace()
+        public void XmlFormattingTests_AddSpaceToTagContentShouldLeaveNoTrailingWhitespace1()
         {
             var input = "<summary>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</summary>";
             var expected =
@@ -90,6 +92,29 @@ public void XmlFormattingTests_AddSpaceToTagContentShouldLeaveNoTrailingWhitespa
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }
 
+        [TestMethod]
+        [TestCategory("Formatting UnitTests")]
+        [Ignore] // This is temporarily ignored until a better fix for #564 is found.
+        public void XmlFormattingTests_AddSpaceToTagContentShouldLeaveNoTrailingWhitespace2()
+        {
+            var input =
+               "<remarks>" + Environment.NewLine +
+               "Lorem ipsum dolor sit amet, consectetur adipiscing elit." + Environment.NewLine +
+               "</remarks>";
+
+            var expected =
+               "<remarks>" + Environment.NewLine +
+               "    Lorem ipsum dolor sit amet, consectetur" + Environment.NewLine +
+               "    adipiscing elit." + Environment.NewLine +
+               "</remarks>";
+
+            Settings.Default.Formatting_CommentWrapColumn = 50;
+            Settings.Default.Formatting_CommentXmlValueIndent = 4;
+            Settings.Default.Formatting_CommentXmlSpaceTags = true;
+
+            CommentFormatHelper.AssertEqualAfterFormat(input, expected);
+        }
+
         [TestMethod]
         [TestCategory("Formatting UnitTests")]
         public void XmlFormattingTests_AllRootLevelTagsOnNewLine()
@@ -185,6 +210,7 @@ public void XmlFormattingTests_DoesIndentAfterLiteralContent()
 
             Settings.Default.Formatting_CommentXmlValueIndent = 4;
             Settings.Default.Formatting_CommentXmlKeepTagsTogether = true;
+            Settings.Default.Formatting_CommentXmlSpaceSingleTags = false;
 
             // First pass.
             var result = CommentFormatHelper.AssertEqualAfterFormat(input, expected);
@@ -264,6 +290,7 @@ public void XmlFormattingTests_DoNotAutoExpandTags()
             var input = "<summary/>";
 
             Settings.Default.Formatting_CommentXmlSplitSummaryTagToMultipleLines = false;
+            Settings.Default.Formatting_CommentXmlSpaceSingleTags = false;
 
             CommentFormatHelper.AssertEqualAfterFormat(input);
         }
@@ -350,6 +377,8 @@ public void XmlFormattingTests_InterpunctionNoSpacing()
         {
             var input = "<test>Line with <interpunction/>.</test>";
 
+            Settings.Default.Formatting_CommentXmlSpaceSingleTags = false;
+
             CommentFormatHelper.AssertEqualAfterFormat(input);
         }
 
@@ -405,6 +434,7 @@ public void XmlFormattingTests_RemoveSpaceFromInsideTags()
             var expected = "<summary><see/></summary>";
 
             Settings.Default.Formatting_CommentXmlSplitSummaryTagToMultipleLines = false;
+            Settings.Default.Formatting_CommentXmlSpaceSingleTags = false;
 
             CommentFormatHelper.AssertEqualAfterFormat(input, expected);
         }

diff --git a/CodeMaid/Integration/Images/about.png b/CodeMaid/Integration/Images/about.png
diff --git a/CodeMaid/Integration/Images/about.xcf b/CodeMaid/Integration/Images/about.xcf
diff --git a/CodeMaid/Logic/Cleaning/InsertBlankLinePaddingLogic.cs b/CodeMaid/Logic/Cleaning/InsertBlankLinePaddingLogic.cs
@@ -77,7 +77,9 @@ internal bool ShouldBePrecededByBlankLine(BaseCodeItem codeItem)
                     return Settings.Default.Cleaning_InsertBlankLinePaddingBeforeEvents;
 
                 case KindCodeItem.Field:
-                    return codeItem.IsMultiLine && Settings.Default.Cleaning_InsertBlankLinePaddingBeforeFieldsMultiLine;
+                    return codeItem.IsMultiLine
+                        ? Settings.Default.Cleaning_InsertBlankLinePaddingBeforeFieldsMultiLine
+                        : Settings.Default.Cleaning_InsertBlankLinePaddingBeforeFieldsSingleLine;
 
                 case KindCodeItem.Interface:
                     return Settings.Default.Cleaning_InsertBlankLinePaddingBeforeInterfaces;
@@ -138,7 +140,9 @@ internal bool ShouldBeFollowedByBlankLine(BaseCodeItem codeItem)
                     return Settings.Default.Cleaning_InsertBlankLinePaddingAfterEvents;
 
                 case KindCodeItem.Field:
-                    return codeItem.IsMultiLine && Settings.Default.Cleaning_InsertBlankLinePaddingAfterFieldsMultiLine;
+                    return codeItem.IsMultiLine
+                        ? Settings.Default.Cleaning_InsertBlankLinePaddingAfterFieldsMultiLine
+                        : Settings.Default.Cleaning_InsertBlankLinePaddingAfterFieldsSingleLine;
 
                 case KindCodeItem.Interface:
                     return Settings.Default.Cleaning_InsertBlankLinePaddingAfterInterfaces;

diff --git a/CodeMaid/Properties/Resources.Designer.cs b/CodeMaid/Properties/Resources.Designer.cs
diff --git a/CodeMaid/Properties/Resources.en-US.resx b/CodeMaid/Properties/Resources.en-US.resx
@@ -771,6 +771,9 @@
   <data name="ShowItemMetadata" xml:space="preserve">
     <value>Show item metadata</value>
   </data>
+  <data name="ShowItemTypes" xml:space="preserve">
+    <value>Show item types</value>
+  </data>
   <data name="ShowMethodParameters" xml:space="preserve">
     <value>Show method parameters</value>
   </data>

diff --git a/CodeMaid/Properties/Resources.resx b/CodeMaid/Properties/Resources.resx
@@ -20,13 +20,13 @@
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
     <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>[base64 mime encoded serialized .NET Framework object]</value>
-  </data>
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
     <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
-  </data>
-    
+    </data>
+                
     There are any number of "resheader" rows that contain simple 
     name/value pairs.
     
@@ -771,6 +771,9 @@
   <data name="ShowItemMetadata" xml:space="preserve">
     <value>Show item metadata</value>
   </data>
+  <data name="ShowItemTypes" xml:space="preserve">
+    <value>Show item types</value>
+  </data>
   <data name="ShowMethodParameters" xml:space="preserve">
     <value>Show method parameters</value>
   </data>

diff --git a/CodeMaid/Properties/Resources.zh-Hans.resx b/CodeMaid/Properties/Resources.zh-Hans.resx
@@ -771,6 +771,9 @@
   <data name="ShowItemMetadata" xml:space="preserve">
     <value>显示项目元数据</value>
   </data>
+  <data name="ShowItemTypes" xml:space="preserve">
+    <value>显示项目类型</value>
+  </data>
   <data name="ShowMethodParameters" xml:space="preserve">
     <value>显示方法参数</value>
   </data>

diff --git a/CodeMaid/Properties/Settings.Designer.cs b/CodeMaid/Properties/Settings.Designer.cs
diff --git a/CodeMaid/Properties/Settings.settings b/CodeMaid/Properties/Settings.settings
@@ -329,6 +329,9 @@
     <Setting Name="Digging_ShowItemMetadata" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="Digging_ShowItemTypes" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
     <Setting Name="Digging_ShowMethodParameters" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
@@ -480,7 +483,7 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="Switching_RelatedFileExtensionsExpression" Type="System.String" Scope="User">
-      <Value Profile="(Default)">.cpp .h||.xaml .xaml.cs||.xml .xsd||.ascx .ascx.cs||.aspx .aspx.cs||.master .master.cs</Value>
+      <Value Profile="(Default)">.cpp .h||.xaml .xaml.cs||.xml .xsd||.ascx .ascx.cs||.aspx .aspx.cs||.master .master.cs||.cshtml .cshtml.cs</Value>
     </Setting>
     <Setting Name="ThirdParty_OtherCleaningCommandsExpression" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
@@ -555,5 +558,11 @@
   &lt;string&gt;ReSharper enable &lt;/string&gt;
 &lt;/ArrayOfString&gt;</Value>
     </Setting>
+    <Setting Name="Cleaning_InsertBlankLinePaddingBeforeFieldsSingleLine" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="Cleaning_InsertBlankLinePaddingAfterFieldsSingleLine" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>