パラメータの途中で改行しない (SA1118)

diff --git a/OpenTween.Tests/Api/TwitterApiTest.cs b/OpenTween.Tests/Api/TwitterApiTest.cs
index 577fccd..125b754 100644 (file)
--- a/OpenTween.Tests/Api/TwitterApiTest.cs
+++ b/OpenTween.Tests/Api/TwitterApiTest.cs
@@ -652,10 +652,7 @@ namespace OpenTween.Api
         public async Task DirectMessagesEventsNew_Test()
         {
             var mock = new Mock<IApiConnection>();
-            mock.Setup(x =>
-                x.PostJsonAsync<TwitterMessageEventSingle>(
-                    new Uri("direct_messages/events/new.json", UriKind.Relative),
-                    @"{
+            var responseText = @"{
   ""event"": {
     ""type"": ""message_create"",
     ""message_create"": {
@@ -673,7 +670,11 @@ namespace OpenTween.Api
       }
     }
   }
-}")
+}";
+            mock.Setup(x =>
+                x.PostJsonAsync<TwitterMessageEventSingle>(
+                    new Uri("direct_messages/events/new.json", UriKind.Relative),
+                    responseText)
             )
             .ReturnsAsync(LazyJson.Create(new TwitterMessageEventSingle()));
 

diff --git a/OpenTween.Tests/Connection/TwitterApiConnectionTest.cs b/OpenTween.Tests/Connection/TwitterApiConnectionTest.cs
index 612e73e..41512aa 100644 (file)
--- a/OpenTween.Tests/Connection/TwitterApiConnectionTest.cs
+++ b/OpenTween.Tests/Connection/TwitterApiConnectionTest.cs
@@ -311,8 +311,7 @@ namespace OpenTween.Connection
             var result = await apiConnection.PostLazyAsync<string>(endpoint, param)
                 .ConfigureAwait(false);
 
-            Assert.Equal("hogehoge", await result.LoadJsonAsync()
-                .ConfigureAwait(false));
+            Assert.Equal("hogehoge", await result.LoadJsonAsync().ConfigureAwait(false));
 
             Assert.Equal(0, mockHandler.QueueCount);
         }
@@ -383,8 +382,7 @@ namespace OpenTween.Connection
             var result = await apiConnection.PostLazyAsync<string>(endpoint, param, mediaParam)
                 .ConfigureAwait(false);
 
-            Assert.Equal("hogehoge", await result.LoadJsonAsync()
-                .ConfigureAwait(false));
+            Assert.Equal("hogehoge", await result.LoadJsonAsync().ConfigureAwait(false));
 
             Assert.Equal(0, mockHandler.QueueCount);
         }
@@ -430,8 +428,7 @@ namespace OpenTween.Connection
             var result = await apiConnection.PostLazyAsync<string>(endpoint, param: null, media: null)
                 .ConfigureAwait(false);
 
-            Assert.Equal("hogehoge", await result.LoadJsonAsync()
-                .ConfigureAwait(false));
+            Assert.Equal("hogehoge", await result.LoadJsonAsync().ConfigureAwait(false));
 
             Assert.Equal(0, mockHandler.QueueCount);
         }

diff --git a/OpenTween/MyCommon.cs b/OpenTween/MyCommon.cs
index 582eb68..2f1461e 100644 (file)
--- a/OpenTween/MyCommon.cs
+++ b/OpenTween/MyCommon.cs
@@ -727,10 +727,11 @@ namespace OpenTween
 
         public static bool IsValidEmail(string strIn)
         {
+            var pattern = @"^(?("")("".+?""@)|(([0-9a-zA-Z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-zA-Z])@))" +
+                @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-zA-Z][-\w]*[0-9a-zA-Z]\.)+[a-zA-Z]{2,6}))$";
+
             // Return true if strIn is in valid e-mail format.
-            return Regex.IsMatch(strIn,
-                   @"^(?("")("".+?""@)|(([0-9a-zA-Z]((\.(?!\.))|[-!#\$%&'\*\+/=\?\^`\{\}\|~\w])*)(?<=[0-9a-zA-Z])@))" +
-                   @"(?(\[)(\[(\d{1,3}\.){3}\d{1,3}\])|(([0-9a-zA-Z][-\w]*[0-9a-zA-Z]\.)+[a-zA-Z]{2,6}))$");
+            return Regex.IsMatch(strIn, pattern);
         }
 
         /// <summary>

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 0dcaca3..4a6c40a 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -4916,6 +4916,10 @@ namespace OpenTween
                         rctB.Height = fontHeight;
 
                         using var fnt = new Font(e.Item.Font, FontStyle.Bold);
+                        var formatFlags1 = TextFormatFlags.WordBreak |
+                            TextFormatFlags.EndEllipsis |
+                            TextFormatFlags.GlyphOverhangPadding |
+                            TextFormatFlags.NoPrefix;
 
                         TextRenderer.DrawText(
                             e.Graphics,
@@ -4923,20 +4927,20 @@ namespace OpenTween
                             e.Item.Font,
                             Rectangle.Round(rct),
                             color,
-                            TextFormatFlags.WordBreak |
+                            formatFlags1);
+
+                        var formatFlags2 = TextFormatFlags.SingleLine |
                             TextFormatFlags.EndEllipsis |
                             TextFormatFlags.GlyphOverhangPadding |
-                            TextFormatFlags.NoPrefix);
+                            TextFormatFlags.NoPrefix;
+
                         TextRenderer.DrawText(
                             e.Graphics,
                             e.Item.SubItems[4].Text + " / " + e.Item.SubItems[1].Text + " (" + e.Item.SubItems[3].Text + ") " + e.Item.SubItems[5].Text + e.Item.SubItems[6].Text + " [" + e.Item.SubItems[7].Text + "]",
                             fnt,
                             rctB,
                             color,
-                            TextFormatFlags.SingleLine |
-                            TextFormatFlags.EndEllipsis |
-                            TextFormatFlags.GlyphOverhangPadding |
-                            TextFormatFlags.NoPrefix);
+                            formatFlags2);
                     }
                     else
                     {
@@ -4948,30 +4952,34 @@ namespace OpenTween
 
                         if (drawLineCount == 1)
                         {
+                            var formatFlags = TextFormatFlags.SingleLine |
+                                TextFormatFlags.EndEllipsis |
+                                TextFormatFlags.GlyphOverhangPadding |
+                                TextFormatFlags.NoPrefix |
+                                TextFormatFlags.VerticalCenter;
+
                             TextRenderer.DrawText(
                                 e.Graphics,
                                 text,
                                 e.Item.Font,
                                 Rectangle.Round(rct),
                                 color,
-                                TextFormatFlags.SingleLine |
-                                TextFormatFlags.EndEllipsis |
-                                TextFormatFlags.GlyphOverhangPadding |
-                                TextFormatFlags.NoPrefix |
-                                TextFormatFlags.VerticalCenter);
+                                formatFlags);
                         }
                         else
                         {
+                            var formatFlags = TextFormatFlags.WordBreak |
+                                TextFormatFlags.EndEllipsis |
+                                TextFormatFlags.GlyphOverhangPadding |
+                                TextFormatFlags.NoPrefix;
+
                             TextRenderer.DrawText(
                                 e.Graphics,
                                 text,
                                 e.Item.Font,
                                 Rectangle.Round(rct),
                                 color,
-                                TextFormatFlags.WordBreak |
-                                TextFormatFlags.EndEllipsis |
-                                TextFormatFlags.GlyphOverhangPadding |
-                                TextFormatFlags.NoPrefix);
+                                formatFlags);
                         }
                     }
                 }