diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2017-08-03 14:37:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-03 14:37:59 +0300 |
| commit | 82392815643a4b93b3b0523501061a1b6314371c (patch) | |
| tree | 829b18752bbe831a3d11bc0a6bbf52d7bc611f9e /main | |
| parent | 093037fbc016e6dc653d74df5c3583d7c99aff6a (diff) | |
| parent | 8d0045ee795191bb59282928f22883232ef924d8 (diff) | |
Merge pull request #2861 from mono/master-fix58286
Fixed 'Bug 58286 - Code Snippet won't expand'
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs index 33a821f080..694fed3100 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs @@ -596,7 +596,12 @@ namespace MonoDevelop.SourceEditor string shortcut = CodeTemplate.GetTemplateShortcutBeforeCaret (EditorExtension.Editor); foreach (CodeTemplate template in CodeTemplateService.GetCodeTemplatesAsync (EditorExtension.Editor).WaitAndGetResult (CancellationToken.None)) { if (template.Shortcut == shortcut) { - InsertTemplate (template, view.WorkbenchWindow.Document.Editor, view.WorkbenchWindow.Document); + var doc = view.WorkbenchWindow?.Document ?? IdeApp.Workbench.ActiveDocument; + if (doc != null) { + InsertTemplate (template, doc.Editor, doc); + } else { + LoggingService.LogError ("DoInsertTemplate(): Can't find valid document"); + } return true; } } |