Merge remote-tracking branch 'origin/master' into buildcrosscheck-updates

Author: StanleyGoldman

.editorconfig

@@ -1,6 +1,73 @@
 # top-most EditorConfig file
 root = true
 
-[*.cs]
+[*.{cs,vb}]
+
 indent_style = space
-indent_size = 4
+indent_size = 4
+
+# Organize usings
+dotnet_sort_system_directives_first = true 
+
+# this. preferences
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Parentheses preferences 
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = never:silent
+dotnet_style_readonly_field = true:suggestion
+
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+
+[*.cs]
+
+# var preferences
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false:none
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_operators = false:none
+csharp_style_expression_bodied_properties = false:none
+csharp_style_expression_bodied_indexers = false:none
+csharp_style_expression_bodied_accessors = false:none
+
+# Pattern matching preferences
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+
+# Null-checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Expression-level preferences
+csharp_prefer_braces = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+
+# Spacing options
+csharp_space_after_keywords_in_control_flow_statements = true

GitHubVS.sln

@@ -10,6 +10,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{72036B62-2FA6-4A22-8B33-69F698A18CF1}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		README.md = README.md
 	EndProjectSection
 EndProject

src/GitHub.App/Services/PullRequestService.cs

@@ -769,7 +769,7 @@ public Encoding GetEncoding(ILocalRepositoryModel repository, string relativePat
                 }
             }
 
-            return Encoding.Default;
+            return null;
         }
 
         static bool HasPreamble(string file, Encoding encoding)
@@ -877,7 +877,15 @@ async Task ExtractToTempFile(
             }
 
             Directory.CreateDirectory(Path.GetDirectoryName(tempFilePath));
-            File.WriteAllText(tempFilePath, contents, encoding);
+
+            if (encoding != null)
+            {
+                File.WriteAllText(tempFilePath, contents, encoding);
+            }
+            else
+            {
+                File.WriteAllText(tempFilePath, contents);
+            }
         }
 
         IEnumerable<string> GetLocalBranchesInternal(
@@ -963,7 +971,7 @@ static string CalculateTempFileName(string relativePath, string commitSha, Encod
         {
             // The combination of relative path, commit SHA and encoding should be sufficient to uniquely identify a file.
             var relativeDir = Path.GetDirectoryName(relativePath) ?? string.Empty;
-            var key = relativeDir + '|' + encoding.WebName;
+            var key = relativeDir + '|' + (encoding?.WebName ?? "unknown");
             var relativePathHash = key.GetSha256Hash();
             var tempDir = Path.Combine(Path.GetTempPath(), "GitHubVisualStudio", "FileContents", relativePathHash);
             var tempFileName = Invariant($"{Path.GetFileNameWithoutExtension(relativePath)}@{commitSha}{Path.GetExtension(relativePath)}");

src/GitHub.App/ViewModels/PullRequestReviewCommentThreadViewModel.cs

@@ -78,7 +78,6 @@ public bool IsNewThread
         public async Task InitializeAsync(
             IPullRequestSession session,
             IPullRequestSessionFile file,
-            PullRequestReviewModel review,
             IInlineCommentThreadModel thread,
             bool addPlaceholder)
         {
@@ -97,7 +96,7 @@ public async Task InitializeAsync(
                 await vm.InitializeAsync(
                     session,
                     this,
-                    review,
+                    comment.Review,
                     comment.Comment,
                     CommentEditState.None).ConfigureAwait(false);
                 Comments.Add(vm);
@@ -110,7 +109,7 @@ await vm.InitializeAsync(
                 await vm.InitializeAsPlaceholderAsync(
                     session,
                     this,
-                    review.State == PullRequestReviewState.Pending,
+                    session.HasPendingReview,
                     false).ConfigureAwait(true);
 
                 var (key, secondaryKey) = GetDraftKeys(vm);

src/GitHub.Exports.Reactive/Services/IPullRequestService.cs

@@ -176,12 +176,12 @@ IObservable<IPullRequestModel> CreatePullRequest(IModelService modelService,
         IObservable<Tuple<string, int>> GetPullRequestForCurrentBranch(ILocalRepositoryModel repository);
 
         /// <summary>
-        /// Gets the encoding for the specified file.
+        /// Gets the encoding for the specified local file.
         /// </summary>
         /// <param name="repository">The repository.</param>
         /// <param name="relativePath">The relative path to the file in the repository.</param>
         /// <returns>
-        /// The file's encoding or <see cref="Encoding.Default"/> if the file doesn't exist.
+        /// The file's encoding or null if the file doesn't exist locally.
         /// </returns>
         Encoding GetEncoding(ILocalRepositoryModel repository, string relativePath);
 
@@ -192,7 +192,9 @@ IObservable<IPullRequestModel> CreatePullRequest(IModelService modelService,
         /// <param name="pullRequest">The pull request details.</param>
         /// <param name="relativePath">The path to the file, relative to the repository root.</param>
         /// <param name="commitSha">The SHA of the commit.</param>
-        /// <param name="encoding">The encoding to use.</param>
+        /// <param name="encoding">
+        /// The encoding to save the file with. If null, will use the file's original encoding.
+        /// </param>
         /// <returns>The path to the temporary file.</returns>
         Task<string> ExtractToTempFile(
             ILocalRepositoryModel repository,

src/GitHub.Exports.Reactive/ViewModels/IPullRequestReviewCommentThreadViewModel.cs

@@ -46,15 +46,13 @@ public interface IPullRequestReviewCommentThreadViewModel : ICommentThreadViewMo
         /// </summary>
         /// <param name="session">The pull request session.</param>
         /// <param name="file">The file that the comment is on.</param>
-        /// <param name="review">The associated review.</param>
         /// <param name="thread">The thread.</param>
         /// <param name="addPlaceholder">
         /// Whether to add a placeholder comment at the end of the thread.
         /// </param>
         Task InitializeAsync(
             IPullRequestSession session,
             IPullRequestSessionFile file,
-            PullRequestReviewModel review,
             IInlineCommentThreadModel thread,
             bool addPlaceholder);
 

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

@@ -845,7 +845,7 @@ static void BuildPullRequestThreads(PullRequestDetailModel model)
             }
 
             // Get the comments that are replies and place them into the relevant list.
-            foreach (CommentAdapter comment in model.Reviews.SelectMany(x => x.Comments))
+            foreach (CommentAdapter comment in model.Reviews.SelectMany(x => x.Comments).OrderBy(x => x.CreatedAt))
             {
                 if (comment.ReplyTo != null)
                 {

src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs

@@ -181,7 +181,7 @@ async Task UpdateThread()
 
             if (thread?.Comments.Count > 0)
             {
-                await vm.InitializeAsync(session, file, thread.Comments[0].Review, thread, true);
+                await vm.InitializeAsync(session, file, thread, true);
             }
             else
             {

src/GitHub.VisualStudio.UI/Views/CommentView.xaml

@@ -56,7 +56,7 @@
                                         Account="{Binding Author}"/>
 
                 <TextBlock Foreground="{DynamicResource GitHubVsToolWindowText}" FontWeight="Bold" Text="{Binding Author.Login}" Margin="4 0"/>
-                <ui:GitHubActionLink Content="{Binding UpdatedAt, Converter={ui:DurationToStringConverter}}"
+                <ui:GitHubActionLink Content="{Binding CreatedAt, Converter={ui:DurationToStringConverter}}"
                                      Command="{Binding OpenOnGitHub}"
                                      Foreground="{DynamicResource GitHubVsToolWindowText}"
                                      Opacity="0.75" />

test/GitHub.App.UnitTests/ViewModels/PullRequestReviewCommentThreadViewModelTests.cs

@@ -111,15 +111,13 @@ async Task<PullRequestReviewCommentThreadViewModel> CreateTarget(
             IViewViewModelFactory factory = null,
             IPullRequestSession session = null,
             IPullRequestSessionFile file = null,
-            PullRequestReviewModel review = null,
             IEnumerable<InlineCommentModel> comments = null,
             bool newThread = false)
         {
             draftStore = draftStore ?? Substitute.For<IMessageDraftStore>();
             factory = factory ?? CreateFactory();
             session = session ?? CreateSession();
             file = file ?? CreateFile();
-            review = review ?? new PullRequestReviewModel();
             comments = comments ?? CreateComments();
 
             var result = new PullRequestReviewCommentThreadViewModel(draftStore, factory);
@@ -134,7 +132,7 @@ async Task<PullRequestReviewCommentThreadViewModel> CreateTarget(
                 thread.Comments.Returns(comments.ToList());
                 thread.LineNumber.Returns(10);
 
-                await result.InitializeAsync(session, file, review, thread, true);
+                await result.InitializeAsync(session, file, thread, true);
             }
 
             return result;