Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt-core to 3.7.15 #513

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.5.9
ff8ca52d610ca63ee0ab4fcfb5d79da13a1250b1

# Scala Steward: Reformat with scalafmt 3.7.15
8fa2251b493a78759fc04a2f74189b9f8bdc07c4
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ rewrite.rules = [RedundantBraces, RedundantParens, SortImports]
spaces.inImportCurlyBraces = true
indentOperator.preset = spray

version=3.7.14
version=3.7.15

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ case class ScalaFirstStubbing[T: ValueClassExtractor](delegate: OngoingStubbing[
* Sets consecutive return one or more values to be returned when the method is called. E.g: <pre class="code"><code class="scala"> when(mock.someMethod) thenReturn 1
* </code></pre> <pre class="code"><code class="scala"> when(mock.someMethod) thenReturn (1, 2, 3) </code></pre>
*
* Last return value in the sequence (in example: 3) determines the behavior of further consecutive calls. <p> See examples in javadoc for {@link org.mockito.MockitoSugar#when}
* Last return value in the sequence (in example: 3) determines the behavior of further consecutive calls. <p> See examples in javadoc for {@@linkorg.mockito.MockitoSugar#when}
*
* @param value
* first return value
Expand All @@ -43,7 +43,7 @@ case class ScalaFirstStubbing[T: ValueClassExtractor](delegate: OngoingStubbing[
* </code></pre> <pre class="code"><code class="java"> when(mock.someMethod) thenThrow (new RuntimeException, new OtherException) </code></pre>
*
* <p> You can specify throwables to be thrown for consecutive calls. In that case the last throwable determines the behavior of further consecutive calls. <p> If throwable is
* null then exception will be thrown. <p> See examples in javadoc for {@link org.mockito.MockitoSugar#when}
* null then exception will be thrown. <p> See examples in javadoc for {@@linkorg.mockito.MockitoSugar#when}
*
* @param throwables
* to be thrown on method invocation
Expand All @@ -57,7 +57,7 @@ case class ScalaFirstStubbing[T: ValueClassExtractor](delegate: OngoingStubbing[
* </code></pre>
*
* <p> If the throwable class is a checked exception then it has to match one of the checked exceptions of the stubbed method signature. <p> If throwable is null then exception
* will be thrown. <p> See examples in javadoc for {@link Mockito#when}
* will be thrown. <p> See examples in javadoc for {@@linkMockito#when}
*
* <p>Note depending on the JVM, stack trace information may not be available in the generated throwable instance. If you require stack trace information, use {@link
* OngoingStubbing#thenThrow(Throwable...)} instead.
Expand All @@ -80,9 +80,9 @@ case class ScalaFirstStubbing[T: ValueClassExtractor](delegate: OngoingStubbing[
*
* // calls real method: mock.someMethod();
*
* </code></pre> See also javadoc {@link Mockito#spy(Object)} to find out more about partial mocks. <b>Mockito.spy() is a recommended way of creating partial mocks.</b> The
* </code></pre> See also javadoc {@@linkMockito#spy(Object)} to find out more about partial mocks. <b>Mockito.spy() is a recommended way of creating partial mocks.</b> The
* reason is it guarantees real methods are called against correctly constructed object because you're responsible for constructing the object passed to spy() method. <p> See
* examples in javadoc for {@link Mockito#when}
* examples in javadoc for {@@linkMockito#when}
*
* @return
* object that allows stubbing consecutive calls
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ case class ScalaOngoingStubbing[T: ValueClassExtractor](delegate: OngoingStubbin
/**
* Sets consecutive return values to be returned when the method is called. E.g: <pre class="code"><code class="java"> when(mock.someMethod()).thenReturn(1, 2, 3); </code></pre>
*
* Last return value in the sequence (in example: 3) determines the behavior of further consecutive calls. <p> See examples in javadoc for {@link Mockito#when}
* Last return value in the sequence (in example: 3) determines the behavior of further consecutive calls. <p> See examples in javadoc for {@@linkMockito#when}
*
* @param value
* first return value
Expand All @@ -32,7 +32,7 @@ case class ScalaOngoingStubbing[T: ValueClassExtractor](delegate: OngoingStubbin
*
* If throwables contain a checked exception then it has to match one of the checked exceptions of method signature. <p> You can specify throwables to be thrown for consecutive
* calls. In that case the last throwable determines the behavior of further consecutive calls. <p> If throwable is null then exception will be thrown. <p> See examples in
* javadoc for {@link Mockito#when}
* javadoc for {@@linkMockito#when}
*
* @param throwables
* to be thrown on method invocation
Expand All @@ -46,7 +46,7 @@ case class ScalaOngoingStubbing[T: ValueClassExtractor](delegate: OngoingStubbin
* </code></pre>
*
* <p> If the throwable class is a checked exception then it has to match one of the checked exceptions of the stubbed method signature. <p> If throwable is null then exception
* will be thrown. <p> See examples in javadoc for {@link Mockito#when}
* will be thrown. <p> See examples in javadoc for {@@linkMockito#when}
*
* <p>Note depending on the JVM, stack trace information may not be available in the generated throwable instance. If you require stack trace information, use {@link
* OngoingStubbing#thenThrow(Throwable...)} instead.
Expand All @@ -69,9 +69,9 @@ case class ScalaOngoingStubbing[T: ValueClassExtractor](delegate: OngoingStubbin
*
* // calls real method: mock.someMethod();
*
* </code></pre> See also javadoc {@link Mockito#spy(Object)} to find out more about partial mocks. <b>Mockito.spy() is a recommended way of creating partial mocks.</b> The
* </code></pre> See also javadoc {@@linkMockito#spy(Object)} to find out more about partial mocks. <b>Mockito.spy() is a recommended way of creating partial mocks.</b> The
* reason is it guarantees real methods are called against correctly constructed object because you're responsible for constructing the object passed to spy() method. <p> See
* examples in javadoc for {@link Mockito#when}
* examples in javadoc for {@@linkMockito#when}
*
* @return
* object that allows stubbing consecutive calls
Expand Down
Loading