Sync with vs-editor-core@8ff5248b

2 files changed, 20 insertions, 3 deletions

diff --git a/Directory.Build.props b/Directory.Build.props
index 008a2df..8480a2b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <NuGetVersionRoslyn>3.2.0-beta4-19312-10</NuGetVersionRoslyn>
+    <NuGetVersionRoslyn>3.2.0-beta4-19317-08</NuGetVersionRoslyn>
     <NuGetVersionVSEditor Condition="$(NuGetVersionVSEditor) == ''">16.0.379-g4a55b0e4f2</NuGetVersionVSEditor>
   </PropertyGroup>
 
@@ -34,4 +34,4 @@
   <Import
     Condition="'$(MSBuildProjectExtension)' == '.csproj'"
     Project="$(RepoRootPath)build\Project.props"/>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Editor/Text/Def/TextUI/EditorOptions/ViewOptions.cs b/src/Editor/Text/Def/TextUI/EditorOptions/ViewOptions.cs
index 38457c4..3af982d 100644
--- a/src/Editor/Text/Def/TextUI/EditorOptions/ViewOptions.cs
+++ b/src/Editor/Text/Def/TextUI/EditorOptions/ViewOptions.cs
@@ -499,6 +499,12 @@ namespace Microsoft.VisualStudio.Text.Editor
         /// </summary>
         public static readonly EditorOptionKey<bool> ShouldMoveCaretOnSelectAllId = new EditorOptionKey<bool>(ShouldMoveCaretOnSelectAllName);
         public const string ShouldMoveCaretOnSelectAllName = "TextView/ShouldMoveCaretOnSelectAll";
+
+        /// <summary>
+        /// Defines where vertical rulers, if any, are to be drawn in the editor.
+        /// </summary>
+        public const string VerticalRulersName = "TextView/VerticalRulers";
+        public static readonly EditorOptionKey<int[]> VerticalRulersId = new EditorOptionKey<int[]>(VerticalRulersName);
         #endregion
     }
 
@@ -1374,4 +1380,15 @@ namespace Microsoft.VisualStudio.Text.Editor
         /// </summary>
         public override EditorOptionKey<bool> Key => DefaultTextViewOptions.ShouldMoveCaretOnSelectAllId;
     }
-}
+
+    /// <summary>
+    /// Determines whether to display the vertical ruler or not.
+    /// </summary>
+    [Export(typeof(EditorOptionDefinition))]
+    [Name(DefaultTextViewOptions.VerticalRulersName)]
+    internal sealed class VerticalRulersOption : EditorOptionDefinition<int[]>
+    {
+        public override int[] Default => Array.Empty<int>();
+        public override EditorOptionKey<int[]> Key => DefaultTextViewOptions.VerticalRulersId;
+    }
+}
\ No newline at end of file