From 5c8da2e7204fccaf440bc80fcd26d720bbb98e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Karlas=CC=8C?= Date: Tue, 10 Dec 2019 10:58:01 +0100 Subject: [PATCH 1/2] Sync vs-editor-api and adopt code to changes --- main/Main.sln | 13 +++++++++++++ main/external/vs-editor-api | 2 +- main/msbuild/ReferencesVSEditor.Mac.props | 1 + .../VSEditor/IMdTextView.cs | 13 ++++--------- .../MonoDevelop.TextEditor.Cocoa.addin.xml | 2 ++ .../TextViewContent.Commands.cs | 4 ++-- .../TextViewContent.Toolbox.cs | 2 +- .../MonoDevelop.Ide.Gui/ViewCommandHandlers.cs | 2 +- 8 files changed, 25 insertions(+), 14 deletions(-) diff --git a/main/Main.sln b/main/Main.sln index 8bb83915a1b..3776c79dae3 100644 --- a/main/Main.sln +++ b/main/Main.sln @@ -406,6 +406,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextLogicUtil", "external\v EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUIUtil", "external\vs-editor-api\src\Editor\Text\Util\TextUIUtil\TextUIUtil.csproj", "{B2B41590-92EF-4120-B9B8-E861F3903FDD}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextUICocoaUtil", "external\vs-editor-api\src\Editor\Text\Util\TextUICocoaUtil\TextUICocoaUtil.csproj", "{B2B41590-670F-4169-B3D4-7BC7E77900CE}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{10D43FCD-8287-47D2-A8DD-7BDC77CFBDE7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Def", "Def", "{1EA941BE-66DE-4D0E-B840-FC556F5BA803}" @@ -2435,6 +2437,16 @@ Global {B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU {B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU {B2B41590-92EF-4120-B9B8-E861F3903FDD}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU + {B2B41590-670F-4169-B3D4-7BC7E77900CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU + {B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU + {B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU + {B2B41590-670F-4169-B3D4-7BC7E77900CE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU + {B2B41590-670F-4169-B3D4-7BC7E77900CE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU + {B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU + {B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU + {B2B41590-670F-4169-B3D4-7BC7E77900CE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU {3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU {3AFF3617-E88F-4F96-AA81-00D3D9E15C05}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU @@ -2862,6 +2874,7 @@ Global {1206D585-670F-4951-A6BF-493C79C950E4} = {745BF6CA-BC7C-4863-B1B4-C423A828820A} {69F195E1-A8C9-43B3-AE91-A8FC79393163} = {745BF6CA-BC7C-4863-B1B4-C423A828820A} {B2B41590-92EF-4120-B9B8-E861F3903FDD} = {745BF6CA-BC7C-4863-B1B4-C423A828820A} + {B2B41590-670F-4169-B3D4-7BC7E77900CE} = {745BF6CA-BC7C-4863-B1B4-C423A828820A} {10D43FCD-8287-47D2-A8DD-7BDC77CFBDE7} = {5A92B792-BF17-4748-B29E-34C99B2E8722} {1EA941BE-66DE-4D0E-B840-FC556F5BA803} = {10D43FCD-8287-47D2-A8DD-7BDC77CFBDE7} {3AFF3617-E88F-4F96-AA81-00D3D9E15C05} = {1EA941BE-66DE-4D0E-B840-FC556F5BA803} diff --git a/main/external/vs-editor-api b/main/external/vs-editor-api index 95fbc6cd5cd..109220f5a28 160000 --- a/main/external/vs-editor-api +++ b/main/external/vs-editor-api @@ -1 +1 @@ -Subproject commit 95fbc6cd5cd27fe623036c0c453e707d919e7bc6 +Subproject commit 109220f5a283245ed9ffb70f82ca061d4d6d3dad diff --git a/main/msbuild/ReferencesVSEditor.Mac.props b/main/msbuild/ReferencesVSEditor.Mac.props index 259d58a1c51..4ede8e373c9 100644 --- a/main/msbuild/ReferencesVSEditor.Mac.props +++ b/main/msbuild/ReferencesVSEditor.Mac.props @@ -15,6 +15,7 @@ + diff --git a/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/IMdTextView.cs b/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/IMdTextView.cs index 7e49f15b5bf..cc8724e4bf8 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/IMdTextView.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/VSEditor/IMdTextView.cs @@ -1,17 +1,12 @@ namespace Microsoft.VisualStudio.Text.Editor { - internal interface IMdTextView : -#if WINDOWS - ITextView2 -#else - ITextView3 -#endif + internal interface IMdTextView : ITextView2 { MonoDevelop.SourceEditor.IMDSpaceReservationManager GetSpaceReservationManager(string name); - Gtk.Container VisualElement - { - get; + Gtk.Container VisualElement + { + get; } void Focus(); 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 35bf47e860c..62a9596240b 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 @@ -22,6 +22,7 @@ + @@ -74,6 +75,7 @@ + diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Commands.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Commands.cs index 9f5c3c1988b..249b6508494 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Commands.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Commands.cs @@ -208,8 +208,8 @@ bool CanHandleCommand (object commandId) } } #if !WINDOWS - if (TextView is ITextView3 textView3) - return textView3.IsKeyboardFocused; + if (TextView is ICocoaTextView cocoaTextView) + return cocoaTextView.IsKeyboardFocused; #endif return true; diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Toolbox.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Toolbox.cs index 284b30f0288..da31e691190 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Toolbox.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewContent.Toolbox.cs @@ -22,7 +22,7 @@ void IToolboxConsumer.ConsumeItem (ItemToolboxNode item) if (item is ITextToolboxNode tn) { tn.InsertAtCaret (this.Document); #if !WINDOWS - ((ITextView3)TextView).Focus (); + ((ICocoaTextView)TextView).Focus (); #endif } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs index 4bf701d73fe..c0e6db6bc6a 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ViewCommandHandlers.cs @@ -526,7 +526,7 @@ protected void UpdateEnableDisableFolding (CommandInfo info) #else info.Text = IsFoldMarkerMarginEnabled ? GettextCatalog.GetString ("Disable _Folding") : GettextCatalog.GetString ("Enable _Folding"); info.Enabled = GetContent () != null || - GetContent () != null; + GetContent () != null; // As we need to support both the new and the legacy editor, we need to check if perhaps // we are running in the new one. The legacy editor already implements // so we can't simply look for that and we do not want to import anything related to Cocoa. From c4bdc23fe8704b5b1226d58767e38f2dcd3c6e90 Mon Sep 17 00:00:00 2001 From: Kirill Osenkov Date: Mon, 16 Dec 2019 11:31:37 -0800 Subject: [PATCH 2/2] Update BinaryCompatBaseline.txt --- main/build/MacOSX/BinaryCompatBaseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/main/build/MacOSX/BinaryCompatBaseline.txt b/main/build/MacOSX/BinaryCompatBaseline.txt index cecda65c162..849b3189f5b 100755 --- a/main/build/MacOSX/BinaryCompatBaseline.txt +++ b/main/build/MacOSX/BinaryCompatBaseline.txt @@ -112,7 +112,6 @@ In assembly 'Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral In assembly 'Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve type reference 'System.Windows.Media.VisualTreeHelper' in 'PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' In assembly 'Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve type reference 'System.Windows.PresentationSource' in 'PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' In assembly 'Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve type reference 'System.Windows.TextTrimming' in 'PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' -In assembly 'Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve type reference 'System.Windows.UIElement' in 'PresentationCore, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' In assembly 'Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a': Unable to resolve type reference 'System.Windows.Window' in 'PresentationFramework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' In assembly 'MonoDevelop.Core, Version=2.6.0.0, Culture=neutral, PublicKeyToken=3ead7498f347467b': unable to resolve reference to 'Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' In assembly 'MonoDevelop.Core, Version=2.6.0.0, Culture=neutral, PublicKeyToken=3ead7498f347467b': unable to resolve reference to 'Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'