Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 2b46a6c

Browse files
committed
Fix compile errors after rebase
1 parent 39fb3be commit 2b46a6c

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

src/GitHub.App/Resources.Designer.cs

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/GitHub.App/Resources.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,4 +306,13 @@ https://git-scm.com/download/win</value>
306306
<data name="InProgress" xml:space="preserve">
307307
<value>InProgress</value>
308308
</data>
309+
<data name="NavigateToEditorStatusMessage" xml:space="preserve">
310+
<value>Press Enter to navigate to Editor</value>
311+
</data>
312+
<data name="NavigateToEditorNotCheckedOutInfoMessage" xml:space="preserve">
313+
<value>Checkout PR branch before navigating to Editor</value>
314+
</data>
315+
<data name="NavigateToEditorNotCheckedOutStatusMessage" xml:space="preserve">
316+
<value>Checkout PR branch and press Enter to navigate to Editor</value>
317+
</data>
309318
</root>

src/GitHub.App/Services/PullRequestEditorService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -470,9 +470,9 @@ void EnableNavigateToEditor(ITextView textView, IPullRequestSession session, IPu
470470
EnableNavigateToEditor(view, session, file);
471471

472472
var statusMessage = session.IsCheckedOut ?
473-
UI.Resources.NavigateToEditorStatusMessage : UI.Resources.NavigateToEditorNotCheckedOutStatusMessage;
473+
App.Resources.NavigateToEditorStatusMessage : App.Resources.NavigateToEditorNotCheckedOutStatusMessage;
474474
textView.GotAggregateFocus += (s, e) =>
475-
StatusBarNotificationService.ShowMessage(statusMessage);
475+
statusBar.ShowMessage(statusMessage);
476476

477477
textView.LostAggregateFocus += (s, e) =>
478478
statusBar.ShowMessage(string.Empty);
@@ -497,7 +497,7 @@ async Task DoNavigateToEditor(IPullRequestSession session, IPullRequestSessionFi
497497
{
498498
if (!session.IsCheckedOut)
499499
{
500-
ShowInfoMessage(UI.Resources.NavigateToEditorNotCheckedOutInfoMessage);
500+
ShowInfoMessage(App.Resources.NavigateToEditorNotCheckedOutInfoMessage);
501501
return;
502502
}
503503

src/GitHub.VisualStudio.UI/Resources.Designer.cs

Lines changed: 0 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/GitHub.VisualStudio.UI/Resources.resx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -416,13 +416,4 @@
416416
<data name="AddSingleComment" xml:space="preserve">
417417
<value>Add a single comment</value>
418418
</data>
419-
<data name="NavigateToEditorStatusMessage" xml:space="preserve">
420-
<value>Press Enter to navigate to Editor</value>
421-
</data>
422-
<data name="NavigateToEditorNotCheckedOutInfoMessage" xml:space="preserve">
423-
<value>Checkout PR branch before navigating to Editor</value>
424-
</data>
425-
<data name="NavigateToEditorNotCheckedOutStatusMessage" xml:space="preserve">
426-
<value>Checkout PR branch and press Enter to navigate to Editor</value>
427-
</data>
428419
</root>

0 commit comments

Comments
 (0)