Fix imports.

src/EditorFeatures/CSharp/Formatting/CSharpEditorFormattingService.cs

@@ -125,6 +125,12 @@ private IEnumerable<IFormattingRule> GetFormattingRules(Document document, int p
 
         public async Task<IList<TextChange>> GetFormattingChangesOnReturnAsync(Document document, int caretPosition, CancellationToken cancellationToken)
         {
+            var options = await document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
+            if (!options.GetOption(FeatureOnOffOptions.AutoFormattingOnReturn))
+            {
+                return null;
+            }
+
             var formattingRules = this.GetFormattingRules(document, caretPosition);
 
             // first, find the token user just typed.

src/EditorFeatures/Core/Implementation/Formatting/FormatCommandHandler.cs

@@ -119,8 +119,6 @@ public void ExecuteReturnOrTypeCommand(CommandArgs args, Action nextHandler, Can
                 return;
             }
 
-            var options = document.GetOptionsAsync(CancellationToken.None).WaitAndGetResult(CancellationToken.None);
-
             var service = document.GetLanguageService<IEditorFormattingService>();
             if (service == null)
             {
@@ -131,8 +129,7 @@ public void ExecuteReturnOrTypeCommand(CommandArgs args, Action nextHandler, Can
             var caretPositionMarker = new SnapshotPoint(args.SubjectBuffer.CurrentSnapshot, caretPosition.Value);
             if (args is ReturnKeyCommandArgs)
             {
-                if (!options.GetOption(FeatureOnOffOptions.AutoFormattingOnReturn) ||
-                    !service.SupportsFormatOnReturn ||
+                if (!service.SupportsFormatOnReturn ||
                     !TryFormat(textView, document, service, ' ', caretPositionMarker, formatOnReturn: true, cancellationToken: cancellationToken))
                 {
                     return;

src/VisualStudio/CSharp/Impl/Options/Formatting/FormattingOptionPageControl.xaml.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+using System;
+using System.Windows;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.VisualStudio.LanguageServices.Implementation.Options;
-using System;
-using System.Windows;
 
 namespace Microsoft.VisualStudio.LanguageServices.CSharp.Options
 {