diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2019-07-10 17:06:56 +0300 |
|---|---|---|
| committer | monojenkins <jo.shields+jenkins@xamarin.com> | 2019-07-11 17:36:49 +0300 |
| commit | 10ca3b99d33a052d5ae7b94397cc2e58bb625dc1 (patch) | |
| tree | f3958cd39bd57ed5373a3e8bb53f79aef57a40b9 /main | |
| parent | 4aaf49aa0bb9cd12f4447f5e5b2189a3c593a9e6 (diff) | |
[C#] Fix crasher in code actions in the old editor
```
ERROR [2019-07-03 23:58:10Z]: An unhandled exception has occurred. Terminating Visual Studio? False
System.NullReferenceException: Object reference not set to an instance of an object
at MonoDevelop.CodeActions.CodeActionEditorExtension+<>c__DisplayClass14_1.<GetCurrentFixesAsync>b__2 () [0x00000] in /Users/vsts/agent/2.153.2/work/1/s/monodevelop/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs:161
at (wrapper delegate-invoke) System.Func`1[System.Collections.Immutable.ImmutableArray`1[Microsoft.CodeAnalysis.CodeFixes.CodeFixCollection]].invoke_TResult()
at MonoDevelop.Core.Runtime+<>c__44`1[T].<RunInMainThread>b__44_0 (System.Object state) [0x00013] in /Users/vsts/agent/2.153.2/work/1/s/monodevelop/main/src/core/MonoDevelop.Core/MonoDevelop.Core/Runtime.cs:369
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs index e175ef29fc..73fad46ae4 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeActions/CodeActionEditorExtension.cs @@ -129,11 +129,13 @@ namespace MonoDevelop.CodeActions { var loc = Editor.CaretOffset; var ad = DocumentContext.AnalysisDocument; + var workspace = ad?.Project?.Solution?.Workspace; var line = Editor.GetLine (Editor.CaretLine); - if (ad == null) { + if (ad == null || workspace == null) { return Task.FromResult (CodeActionContainer.Empty); } + TextSpan span; if (Editor.IsSomethingSelected) { var selectionRange = Editor.SelectionRange; @@ -158,7 +160,7 @@ namespace MonoDevelop.CodeActions var lineSpan = new TextSpan (line.Offset, line.Length); var fixes = await codeFixService.GetFixesAsync (ad, lineSpan, true, cancellationToken); - fixes = await Runtime.RunInMainThread(() => FilterOnUIThread (fixes, DocumentContext.RoslynWorkspace)); + fixes = await Runtime.RunInMainThread(() => FilterOnUIThread (fixes, workspace)); var refactorings = await codeRefactoringService.GetRefactoringsAsync (ad, span, cancellationToken); var codeActionContainer = new CodeActionContainer (fixes, refactorings); |