diff options
Diffstat (limited to 'main/src/addins/MonoDevelop.TextEditor')
11 files changed, 19 insertions, 2 deletions
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj index 43dfde632b..065924b5e5 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj @@ -133,6 +133,14 @@ <None Remove="icons\go-down-16%402x.png" /> <None Remove="icons\go-down-16~contrast.png" /> <None Remove="icons\go-down-16~contrast%402x.png" /> + <None Remove="icons\vs-go-to-line-16.png" /> + <None Remove="icons\vs-go-to-line-16~contrast%402x.png" /> + <None Remove="icons\vs-go-to-line-16~contrast~dark.png" /> + <None Remove="icons\vs-go-to-line-16~contrast~dark%402x.png" /> + <None Remove="icons\vs-go-to-line-16~contrast.png" /> + <None Remove="icons\vs-go-to-line-16%402x.png" /> + <None Remove="icons\vs-go-to-line-16~dark%402x.png" /> + <None Remove="icons\vs-go-to-line-16~dark.png" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="icons\vs-find-replace-close-16.png" /> @@ -159,6 +167,14 @@ <EmbeddedResource Include="icons\go-down-16%402x.png" /> <EmbeddedResource Include="icons\go-down-16~contrast.png" /> <EmbeddedResource Include="icons\go-down-16~contrast%402x.png" /> + <EmbeddedResource Include="icons\vs-go-to-line-16.png"/> + <EmbeddedResource Include="icons\vs-go-to-line-16~contrast%402x.png"/> + <EmbeddedResource Include="icons\vs-go-to-line-16~contrast~dark.png"/> + <EmbeddedResource Include="icons\vs-go-to-line-16~contrast~dark%402x.png"/> + <EmbeddedResource Include="icons\vs-go-to-line-16~contrast.png"/> + <EmbeddedResource Include="icons\vs-go-to-line-16%402x.png"/> + <EmbeddedResource Include="icons\vs-go-to-line-16~dark%402x.png"/> + <EmbeddedResource Include="icons\vs-go-to-line-16~dark.png"/> </ItemGroup> <Target Name="BuildTextMate" BeforeTargets="Compile"> <MSBuild Projects="$(VSEditorCoreDirectory)src\Editor\TextMate\TMRegEx\TMRegEx.proj" Targets="Build" Properties="Configuration=$(Configuration)" /> diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml index 62a9596240..4738e17729 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml @@ -89,6 +89,7 @@ <StockIcon stockid="vs-find-replace-option-case-sensitive" resource="vs-find-replace-option-case-sensitive-16.png" size="Menu" imageid="{6114fe54-2a4a-4354-aabb-d2b8fad160a5}#3" /> <StockIcon stockid="vs-find-replace-option-regex" resource="vs-find-replace-option-regex-16.png" size="Menu" imageid="{6114fe54-2a4a-4354-aabb-d2b8fad160a5}#4" /> <StockIcon stockid="vs-find-replace-option-whole-words-only" resource="vs-find-replace-option-whole-words-only-16.png" size="Menu" imageid="{6114fe54-2a4a-4354-aabb-d2b8fad160a5}#5" /> + <StockIcon stockid="vs-go-to-line" resource="vs-go-to-line-16.png" size="Menu" imageid="1705" /> <StockIcon stockid="vs-signature-help-prev" resource="go-up-16.png" size="Menu" imageid="{95fdedcb-dc13-48a8-8165-ed1fff877d9a}#1" /> <StockIcon stockid="vs-signature-help-next" resource="go-down-16.png" size="Menu" imageid="{95fdedcb-dc13-48a8-8165-ed1fff877d9a}#2" /> </Extension> diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16.png Binary files differnew file mode 100644 index 0000000000..855b4bd4e2 --- /dev/null +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16.png diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16@2x.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16@2x.png Binary files differnew file mode 100644 index 0000000000..a9fd1127e8 --- /dev/null +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16@2x.png diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast.png Binary files differnew file mode 100644 index 0000000000..dcdf495008 --- /dev/null +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast.png diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast@2x.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast@2x.png Binary files differnew file mode 100644 index 0000000000..77fdb89da7 --- /dev/null +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast@2x.png diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast~dark.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast~dark.png Binary files differnew file mode 100644 index 0000000000..cd0d96576a --- /dev/null +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast~dark.png diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast~dark@2x.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast~dark@2x.png Binary files differnew file mode 100644 index 0000000000..86555543d8 --- /dev/null +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~contrast~dark@2x.png diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~dark.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~dark.png Binary files differnew file mode 100644 index 0000000000..7caa0f88a4 --- /dev/null +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~dark.png diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~dark@2x.png b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~dark@2x.png Binary files differnew file mode 100644 index 0000000000..ff411b5a51 --- /dev/null +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/icons/vs-go-to-line-16~dark@2x.png diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs index 0e2fb5832b..29c89bce8f 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.cs @@ -444,7 +444,7 @@ namespace MonoDevelop.TextEditor UpdateOptionsFromPolicy (); if (editorConfigContext == null) - return Task.FromResult (false); + return Task.CompletedTask; if (editorConfigContext.CurrentConventions.UniversalConventions.TryGetIndentStyle (out var indentStyle)) SetOptionValue (DefaultOptions.ConvertTabsToSpacesOptionName, indentStyle == IndentStyle.Spaces); @@ -486,7 +486,7 @@ namespace MonoDevelop.TextEditor EditorOptions.SetOptionValue (DefaultTextViewOptions.VerticalRulersName, verticalRulers ?? Array.Empty<int> ()); #endif - return Task.FromResult (true); + return Task.CompletedTask; } private void PolicyChanged (object sender, PolicyChangedEventArgs e) |