From faef08b28069c184b7f18f2a0aad9425086deadd Mon Sep 17 00:00:00 2001 From: Mads Kristensen Date: Fri, 14 Jan 2022 13:14:50 -0800 Subject: [PATCH] Added github files and fixed dropdown loading [release] --- .github/ISSUE_TEMPLATE.md | 11 --------- .github/ISSUE_TEMPLATE/bug_report.md | 27 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++++++++ src/Editor/DropdownBars.cs | 25 ++++++++++++--------- src/PkgdefLanguage.csproj | 4 ++-- test/PkgdefLanguage.Test.csproj | 2 +- 6 files changed, 65 insertions(+), 24 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 9e5424b..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,11 +0,0 @@ -### Description -[Description of the bug or feature] - -### Steps to reproduce -1. [First Step] -2. [Second Step] -3. [and so on...] - -**Expected behavior:** [What you expected to happen] - -**Actual behavior:** [What actually happened] \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..160740e --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,27 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: bug +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..11fc491 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/src/Editor/DropdownBars.cs b/src/Editor/DropdownBars.cs index e2f9a65..8d91b60 100644 --- a/src/Editor/DropdownBars.cs +++ b/src/Editor/DropdownBars.cs @@ -16,18 +16,26 @@ internal class DropdownBars : TypeAndMemberDropdownBars, IDisposable private bool _disposed; private bool _bufferHasChanged; - public DropdownBars(IVsTextView textView, LanguageService languageService) - : base(languageService) + public DropdownBars(IVsTextView textView, LanguageService languageService) : base(languageService) { _languageService = languageService; - _textView = textView.ToIWpfTextView(); - _textView.Caret.PositionChanged += CaretPositionChanged; - _document = _textView.TextBuffer.GetDocument(); _document.Processed += OnDocumentProcessed; - //SynchronizeDropdowns(); + InitializeAsync(textView).FireAndForget(); + } + + // This moves the caret to trigger initial drop down load + private Task InitializeAsync(IVsTextView textView) + { + return ThreadHelper.JoinableTaskFactory.StartOnIdle(() => + { + textView.SendExplicitFocus(); + _textView.Caret.MoveToNextCaretPosition(); + _textView.Caret.PositionChanged += CaretPositionChanged; + _textView.Caret.MoveToPreviousCaretPosition(); + }).Task; } private void CaretPositionChanged(object sender, CaretPositionChangedEventArgs e) => SynchronizeDropdowns(); @@ -46,10 +54,7 @@ private void SynchronizeDropdowns() _ = ThreadHelper.JoinableTaskFactory.StartOnIdle(() => { - if (!_document.IsProcessing) - { - _languageService.SynchronizeDropdowns(); - } + _languageService.SynchronizeDropdowns(); }, VsTaskRunContext.UIThreadIdlePriority); } diff --git a/src/PkgdefLanguage.csproj b/src/PkgdefLanguage.csproj index cd6365f..967927c 100644 --- a/src/PkgdefLanguage.csproj +++ b/src/PkgdefLanguage.csproj @@ -70,11 +70,11 @@ - + compile; build; native; contentfiles; analyzers; buildtransitive - 17.0.5232 + 17.0.5234 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/PkgdefLanguage.Test.csproj b/test/PkgdefLanguage.Test.csproj index a42809c..90a1807 100644 --- a/test/PkgdefLanguage.Test.csproj +++ b/test/PkgdefLanguage.Test.csproj @@ -7,7 +7,7 @@ - +