replace repetitions #3185

sam0410 · 2017-11-01T20:19:18Z

No description provided.

annevk

Thanks! I'm a little bit concerned about the number of nits I found given the size of the diff. Someone else should probably do another pass once you fixed these nits to be sure nothing is missed.

annevk · 2017-11-02T14:00:23Z

source

@@ -27481,7 +27480,7 @@ was an English &lt;a href="/wiki/Music_hall">music hall&lt;/a> singer, ...</pre>
   <li><p><span>Update the source set</span> for <var>el</var>.</p></li>

   <li><p>If <var>el</var>'s <span>source set</span> is empty,
-   return null as the URL and undefined as the pixel density and abort these steps.</p></li>
+   return null as the URL and undefined as the pixel density and return.</p></li>


This does not make sense.

annevk · 2017-11-02T14:00:29Z

source

@@ -27619,7 +27618,7 @@ was an English &lt;a href="/wiki/Music_hall">music hall&lt;/a> singer, ...</pre>
   data-x="concept-microsyntax-parse-error">parse error</span>.</p></li>

   <li><p>If <var>position</var> is past the end of <var>input</var>,
-   return <var>candidates</var> and abort these steps.</p></li>
+   return <var>candidates</var> and return.</p></li>


Same problem here.

annevk · 2017-11-02T14:02:15Z

source

@@ -34638,7 +34637,7 @@ interface <dfn>MediaError</dfn> {
    not null and its <span data-x="concept-MediaError-code">code</span> is <code
    data-x="dom-MediaError-MEDIA_ERR_SRC_NOT_SUPPORTED">MEDIA_ERR_SRC_NOT_SUPPORTED</code>, return a
    promise rejected with a <span>"<code>NotSupportedError</code>"</span> <code>DOMException</code>
-    and abort these steps.</p>
+    and return.</p>


return and return again

annevk · 2017-11-02T14:06:20Z

source


   </li>

   <li>

    <p>Otherwise, if <var>objects</var> has only one element, return that element and
-    abort these steps.</p>
+    return.</p>


return and return

annevk · 2017-11-02T14:06:25Z

source

@@ -78518,14 +78507,14 @@ callback <dfn>FrameRequestCallback</dfn> = void (<span>DOMHighResTimeStamp</span
    <p>If <var>objects</var> contains a <span>nested browsing context</span>, then return
    the <code>WindowProxy</code> object of the <span>nested browsing context</span> corresponding to
    the first <span>browsing context container</span> in <span>tree order</span> whose
-    <span>nested browsing context</span> is in <var>objects</var>, and abort these steps.</p>
+    <span>nested browsing context</span> is in <var>objects</var>, and return.</p>


return and return

annevk · 2017-11-02T14:09:12Z

source

@@ -87278,11 +87265,11 @@ interface <dfn>NavigatorOnLine</dfn> {

   <li><p>If the <span data-x="concept-settings-object-global">global object</span> specified by
   <var>settings</var> is a <code>Window</code> object whose <code>Document</code> object is not
-   <span>fully active</span>, then return "do not run" and abort these steps.</p>
+   <span>fully active</span>, then return "do not run" and return.</p>


return and return

annevk · 2017-11-02T14:11:02Z

source

@@ -100422,7 +100406,7 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
    resource other than the resource's contents, including the address of the resource. If
    autodetection succeeds in determining a character encoding, and that encoding is a supported
    encoding, then return that encoding, with the <span
-    data-x="concept-encoding-confidence">confidence</span> <i>tentative</i>, and abort these steps.
+    data-x="concept-encoding-confidence">confidence</span> <i>tentative</i>, and return.


return and return

annevk · 2017-11-02T14:11:06Z

source

@@ -100361,7 +100345,7 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {

   <li><p>If the transport layer specifies a character encoding, and it is supported, return that
   encoding with the <span data-x="concept-encoding-confidence">confidence</span> <i>certain</i>, and
-   abort these steps.</p></li>
+   return.</p></li>


return and return

annevk · 2017-11-02T14:11:10Z

source

@@ -100335,7 +100319,7 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {

    <p>If the user has explicitly instructed the user agent to override the document's character
    encoding with a specific encoding, optionally return that encoding with the <span
-    data-x="concept-encoding-confidence">confidence</span> <i>certain</i> and abort these steps.</p>
+    data-x="concept-encoding-confidence">confidence</span> <i>certain</i> and return.</p>


return and return

annevk · 2017-11-02T14:11:23Z

source

@@ -98313,7 +98297,7 @@ interface <dfn>WindowLocalStorage</dfn> {
  <ol>

   <li><p>The user agent may throw a <span>"<code>SecurityError</code>"</span>
-   <code>DOMException</code> and abort these steps instead of returning a <code>Storage</code>
+   <code>DOMException</code> and return instead of returning a <code>Storage</code>


throw and return

TejasQ

LGTM

annevk · 2017-11-06T13:35:40Z

@zcorpan @domenic @foolip could one of you do a final pass here?

domenic

Found a few missing ones and a few that could be phrased a bit better, and tweaked them. I don't think this can close the original issue entirely as a lot of "abort these steps" remain that should still be replaced, probably because they were split over two lines and thus missed by the regex @sam0410 was using. But we should go ahead and merge this now, I think.

annevk · 2017-11-14T12:42:42Z

Thanks @sam0410!

replace repititions

7359f16

sam0410 mentioned this pull request Nov 1, 2017

replace "abort these steps" #3152

Closed

annevk reviewed Nov 2, 2017

View reviewed changes

TejasQ approved these changes Nov 2, 2017

View reviewed changes

sam0410 added 2 commits November 3, 2017 19:02

add changes

65d2c98

add changes

19d5ab3

More touchups

80a6377

domenic approved these changes Nov 13, 2017

View reviewed changes

annevk merged commit 7ebc44a into whatwg:master Nov 14, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

replace repetitions #3185

replace repetitions #3185

sam0410 commented Nov 1, 2017

annevk left a comment

annevk Nov 2, 2017

annevk Nov 2, 2017

annevk Nov 2, 2017

annevk Nov 2, 2017

annevk Nov 2, 2017

annevk Nov 2, 2017

annevk Nov 2, 2017

annevk Nov 2, 2017

annevk Nov 2, 2017

annevk Nov 2, 2017

TejasQ left a comment

annevk commented Nov 6, 2017

domenic left a comment

annevk commented Nov 14, 2017

replace repetitions #3185

replace repetitions #3185

Conversation

sam0410 commented Nov 1, 2017

annevk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TejasQ left a comment

Choose a reason for hiding this comment

annevk commented Nov 6, 2017

domenic left a comment

Choose a reason for hiding this comment

annevk commented Nov 14, 2017