diff options
| author | Aaron Bockover <abock@microsoft.com> | 2019-06-28 01:32:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-28 01:32:41 +0300 |
| commit | 4d217b20f5677fbdfa93a272c847651a20c495ad (patch) | |
| tree | 106ddf9f239fc22041360907c71d1a8933e66637 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor | |
| parent | 1be1bd46c5a219e64770ab19dfa7a918905dc310 (diff) | |
| parent | 18822bd35cb00fc0da463ef23d801892a0a39145 (diff) | |
Merge pull request #8019 from mono/dev/rigibson/update-roslyn
Bump Roslyn to 3.2.0-beta4-19324-01
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs | 14 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs | 5 |
2 files changed, 0 insertions, 19 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs index 2757ac63c8..3d812dfa67 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/DefaultSourceEditorOptions.cs @@ -993,20 +993,6 @@ namespace MonoDevelop.Ide.Editor } public event EventHandler Changed; - - /// <summary> - /// This is to allow setting UseAsyncCompletion to true for the Cocoa editor and to false for the Gtk editor. - /// Currently Roslyn doesn't allow setting this option per view, so we have to work around. - /// See here for details: https://github.com/dotnet/roslyn/issues/33807 - /// </summary> - internal static void SetUseAsyncCompletion(bool useAsyncCompletion) - { - var asyncCompletionService = Composition.CompositionManager.Instance.GetExportedValue<Microsoft.CodeAnalysis.Editor.IAsyncCompletionService> (); - var field = asyncCompletionService.GetType ().GetField ( - "_newCompletionAPIEnabled", - System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); - field.SetValue (asyncCompletionService, useAsyncCompletion); - } } } diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs index 62b604c931..b262e0c3cf 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/TextEditorViewContent.cs @@ -409,11 +409,6 @@ namespace MonoDevelop.Ide.Editor protected override void OnGrabFocus (DocumentView view) { textEditor.GrabFocus (); - try { - DefaultSourceEditorOptions.SetUseAsyncCompletion (false); - } catch (Exception e) { - LoggingService.LogInternalError ("Error while setting up async completion.", e); - } } } }
\ No newline at end of file |