Skip to content

Commit 79e8f4c

Browse files
japgollyjapgolly
committed
Added underscores to AnyVal vals
Because the vals are exposed they conflict with valid methods like .a
1 parent 5cf14d1 commit 79e8f4c

File tree

4 files changed

+84
-84
lines changed

4 files changed

+84
-84
lines changed

‎core/src/main/scala/japgolly/scalajs/react/package.scala‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -105,19 +105,19 @@ package object react {
105105
new RefComp[P, S, B, N](name)
106106
}
107107

108-
implicit final class ReactExt_ScalaColl[A](val as: TraversableOnce[A]) extends AnyVal {
108+
@inline implicit final class ReactExt_ScalaColl[A](val _as: TraversableOnce[A]) extends AnyVal {
109109
@inline def toJsArray: js.Array[A] =
110-
js.Array(as.toSeq: _*)
110+
js.Array(_as.toSeq: _*)
111111
@inline def toReactNodeArray(implicit ev: A => ReactNode): js.Array[ReactNode] = {
112112
val r = new js.Array[ReactNode]()
113-
as.foreach(a => r.push(ev(a)))
113+
_as.foreach(a => r.push(ev(a)))
114114
r
115115
}
116116
}
117117

118-
implicit final class ReactExt_JsArray[A](val as: js.Array[A]) extends AnyVal {
118+
@inline implicit final class ReactExt_JsArray[A](val _as: js.Array[A]) extends AnyVal {
119119
@inline def toReactNodeArray(implicit ev: A => ReactNode): js.Array[ReactNode] =
120-
as.map(ev: js.Function1[A, ReactNode])
120+
_as.map(ev: js.Function1[A, ReactNode])
121121
}
122122

123123
@inline implicit def reactNodeInhabitableN [T <% js.Number](v: T) : ReactNode = (v: js.Number).asInstanceOf[ReactNode]
@@ -203,55 +203,55 @@ package object react {
203203
// ===================================================================================================================
204204

205205
@inline implicit def autoUnWrapObj[A](a: WrapObj[A]): A = a.v
206-
implicit final class ReactExt_Any[A](val a: A) extends AnyVal {
207-
@inline def wrap: WrapObj[A] = WrapObj(a)
206+
@inline implicit final class ReactExt_Any[A](val _a: A) extends AnyVal {
207+
@inline def wrap: WrapObj[A] = WrapObj(_a)
208208
}
209209

210-
implicit final class ReactExt_ReactObj(val u: React.type) extends AnyVal {
210+
@inline implicit final class ReactExt_ReactObj(val _r: React.type) extends AnyVal {
211211
@deprecated("React.renderComponentC will be deprecated in a future version. Use React.renderC instead.", "0.6.0")
212212
@inline def renderComponentC[P, S, B, N <: TopNode](c: ReactComponentU[P,S,B,N], n: dom.Node)(callback: ComponentScopeMN[P,S,B,N] => Unit) =
213-
u.render(c, n, callback)
213+
_r.render(c, n, callback)
214214
@inline def renderC[P, S, B, N <: TopNode](c: ReactComponentU[P,S,B,N], n: dom.Node)(callback: ComponentScopeMN[P,S,B,N] => Unit) =
215-
u.render(c, n, callback)
215+
_r.render(c, n, callback)
216216
}
217217

218-
implicit final class ReactExt_ComponentScope_P[Props](val u: ComponentScope_P[Props]) extends AnyVal {
219-
@inline def props = u._props.v
220-
@inline def propsChildren = u._props.children
218+
@inline implicit final class ReactExt_ComponentScope_P[Props](val _c: ComponentScope_P[Props]) extends AnyVal {
219+
@inline def props = _c._props.v
220+
@inline def propsChildren = _c._props.children
221221
}
222222

223-
implicit final class ReactExt_ComponentScope_PS[Props, State](val u: ComponentScope_PS[Props, State]) extends AnyVal {
224-
@inline def getInitialState(p: Props): State = u._getInitialState(WrapObj(p)).v
223+
@inline implicit final class ReactExt_ComponentScope_PS[Props, State](val _c: ComponentScope_PS[Props, State]) extends AnyVal {
224+
@inline def getInitialState(p: Props): State = _c._getInitialState(WrapObj(p)).v
225225
}
226226

227-
implicit final class ReactExt_ComponentScope_S[State](val u: ComponentScope_S[State]) extends AnyVal {
228-
@inline def state = u._state.v
227+
@inline implicit final class ReactExt_ComponentScope_S[State](val _c: ComponentScope_S[State]) extends AnyVal {
228+
@inline def state = _c._state.v
229229
}
230230

231231
val preventDefaultF = (_: SyntheticEvent[dom.Node]).preventDefault()
232232
val stopPropagationF = (_: SyntheticEvent[dom.Node]).stopPropagation()
233233

234-
implicit final class ReactExt_ReactComponentU[P,S,B,N <: TopNode](val u: ReactComponentU[P,S,B,N]) extends AnyVal {
235-
def render(n: dom.Node) = React.render(u, n)
234+
@inline implicit final class ReactExt_ReactComponentU[P,S,B,N <: TopNode](val _c: ReactComponentU[P,S,B,N]) extends AnyVal {
235+
def render(n: dom.Node) = React.render(_c, n)
236236
}
237237

238-
implicit final class ReactExt_UndefReactComponentM[N <: TopNode](val u: UndefOr[ReactComponentM_[N]]) extends AnyVal {
239-
def tryFocus(): Unit = u.foreach(_.getDOMNode().focus())
238+
@inline implicit final class ReactExt_UndefReactComponentM[N <: TopNode](val _u: UndefOr[ReactComponentM_[N]]) extends AnyVal {
239+
def tryFocus(): Unit = _u.foreach(_.getDOMNode().focus())
240240
}
241241

242-
implicit final class ReactExt_ReactComponentM[N <: TopNode](val u: ReactComponentM_[N]) extends AnyVal {
243-
def domType[N2 <: TopNode] = u.asInstanceOf[ReactComponentM_[N2]]
242+
@inline implicit final class ReactExt_ReactComponentM[N <: TopNode](val _c: ReactComponentM_[N]) extends AnyVal {
243+
def domType[N2 <: TopNode] = _c.asInstanceOf[ReactComponentM_[N2]]
244244
}
245245

246-
implicit final class ReactExt_PropsChildren(val u: PropsChildren) extends AnyVal {
246+
@inline implicit final class ReactExt_PropsChildren(val _c: PropsChildren) extends AnyVal {
247247
@inline def forEach[U](f: ReactNode => U): Unit =
248-
React.Children.forEach(u, (f:JFn).asInstanceOf[js.Function1[ReactNode, JAny]])
248+
React.Children.forEach(_c, (f:JFn).asInstanceOf[js.Function1[ReactNode, JAny]])
249249

250250
@inline def forEach[U](f: (ReactNode, Int) => U): Unit =
251-
React.Children.forEach(u, (f:JFn).asInstanceOf[js.Function2[ReactNode, Number, JAny]])
251+
React.Children.forEach(_c, (f:JFn).asInstanceOf[js.Function2[ReactNode, Number, JAny]])
252252

253253
@inline def only: Option[ReactNode] =
254-
try { Some(React.Children.only(u))} catch { case t: Throwable => None}
254+
try { Some(React.Children.only(_c))} catch { case t: Throwable => None}
255255
}
256256

257257
// ===================================================================================================================
@@ -273,14 +273,14 @@ package object react {
273273
}
274274

275275
// CompStateAccess[C] should really be a class param but then we lose the AnyVal
276-
implicit final class CompStateAccessOps[C[_], A](val c: C[A]) extends AnyVal {
276+
@inline implicit final class CompStateAccessOps[C[_], A](val _c: C[A]) extends AnyVal {
277277
type CC = CompStateAccess[C]
278278

279279
@inline def state(implicit C: CC): A =
280-
C.state(c)
280+
C.state(_c)
281281

282282
@inline def setState(a: A, cb: OpCallback = undefined)(implicit C: CC): Unit =
283-
C.setState(c, a, cb)
283+
C.setState(_c, a, cb)
284284

285285
@inline def modState(f: A => A, cb: OpCallback = undefined)(implicit C: CC): Unit =
286286
setState(f(state), cb)
@@ -292,12 +292,12 @@ package object react {
292292
f(state).fold(())(setState(_, cb))
293293

294294
@inline def focusStateId(implicit C: CC) = new ComponentStateFocus[A](
295-
() => c.state,
296-
(a: A, cb: OpCallback) => c.setState(a, cb))
295+
() => _c.state,
296+
(a: A, cb: OpCallback) => _c.setState(a, cb))
297297

298298
@inline def focusState[B](f: A => B)(g: (A, B) => A)(implicit C: CC) = new ComponentStateFocus[B](
299-
() => f(c.state),
300-
(b: B, cb: OpCallback) => c.setState(g(c.state, b), cb))
299+
() => f(_c.state),
300+
(b: B, cb: OpCallback) => _c.setState(g(_c.state, b), cb))
301301
}
302302

303303
final class ComponentStateFocus[B] private[react](

‎core/src/main/scala/japgolly/scalajs/react/vdom/Extra.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ object Extra {
1616
}
1717
}
1818

19-
final class AttrExt(val a: Attr) extends AnyVal {
20-
@inline def runs(thunk: => Unit) = a := ((() => thunk): js.Function)
19+
final class AttrExt(val _a: Attr) extends AnyVal {
20+
@inline def runs(thunk: => Unit) = _a := ((() => thunk): js.Function)
2121
@inline def -->(thunk: => Unit) = runs(thunk)
22-
@inline def ==>[N <: dom.Node, E <: SyntheticEvent[N]](eventHandler: E => Unit) = a := (eventHandler: js.Function)
22+
@inline def ==>[N <: dom.Node, E <: SyntheticEvent[N]](eventHandler: E => Unit) = _a := (eventHandler: js.Function)
2323
}
2424

25-
final class BooleanExt(val a: Boolean) extends AnyVal {
26-
@inline def ?=(m: => TagMod): TagMod = if (a) m else EmptyTag
25+
final class BooleanExt(val _b: Boolean) extends AnyVal {
26+
@inline def ?=(m: => TagMod): TagMod = if (_b) m else EmptyTag
2727
}
2828

2929
trait Tags {

‎scalaz-7.0/src/main/scala/japgolly/scalajs/react/ScalazReact.scala‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Leibniz.===
1111

1212
package vdom {
1313
import Scalatags._
14-
14+
1515
abstract class ScalazImplicits {
1616

1717

@@ -26,29 +26,29 @@ object ScalazReact extends vdom.ScalazImplicits {
2626
override def apply[A](a: Id[A]): IO[A] = IO(a)
2727
}
2828

29-
implicit final class SzRExt_Attr(val a: Attr) extends AnyVal {
29+
@inline implicit final class SzRExt_Attr(val _a: Attr) extends AnyVal {
3030

3131
def ~~>(io: => IO[Unit]) =
32-
a --> io.unsafePerformIO()
32+
_a --> io.unsafePerformIO()
3333

3434
def ~~>[N <: dom.Node, E <: SyntheticEvent[N]](eventHandler: E => IO[Unit]) =
35-
a.==>[N, E](eventHandler(_).unsafePerformIO())
35+
_a.==>[N, E](eventHandler(_).unsafePerformIO())
3636
}
3737

38-
implicit final class SzRExt_C_M(val u: ComponentScope_M[_]) extends AnyVal {
39-
def forceUpdateIO = IO(u.forceUpdate())
38+
@inline implicit final class SzRExt_C_M(val _c: ComponentScope_M[_]) extends AnyVal {
39+
def forceUpdateIO = IO(_c.forceUpdate())
4040
}
4141

42-
implicit final class SzRExt_SEvent[N <: dom.Node](val e: SyntheticEvent[N]) extends AnyVal {
42+
@inline implicit final class SzRExt_SEvent[N <: dom.Node](val _e: SyntheticEvent[N]) extends AnyVal {
4343
/**
4444
* Stops the default action of an element from happening.
4545
* For example: Prevent a submit button from submitting a form Prevent a link from following the URL
4646
*/
47-
def preventDefaultIO = IO(e.preventDefault())
47+
def preventDefaultIO = IO(_e.preventDefault())
4848
/**
4949
* Stops the bubbling of an event to parent elements, preventing any parent event handlers from being executed.
5050
*/
51-
def stopPropagationIO = IO(e.stopPropagation())
51+
def stopPropagationIO = IO(_e.stopPropagation())
5252
}
5353

5454
val preventDefaultIO = (_: SyntheticEvent[dom.Node]).preventDefaultIO
@@ -200,42 +200,42 @@ object ScalazReact extends vdom.ScalazImplicits {
200200
}
201201
}
202202

203-
implicit final class SzRExt_StateTOps[M[+_], S, A](val s: StateT[M, S, A]) extends AnyVal {
204-
@inline def liftS(implicit M: Functor[M]): ReactST[M, S, A] = ReactS.liftS(s)
203+
@inline implicit final class SzRExt_StateTOps[M[+_], S, A](val _s: StateT[M, S, A]) extends AnyVal {
204+
@inline def liftS(implicit M: Functor[M]): ReactST[M, S, A] = ReactS.liftS(_s)
205205
}
206206

207-
implicit final class SzRExt__StateTOps[I, M[+_], S, A](val f: I => StateT[M, S, A]) extends AnyVal {
208-
@inline def liftS(implicit M: Functor[M]): I => ReactST[M, S, A] = f(_).liftS
207+
@inline implicit final class SzRExt__StateTOps[I, M[+_], S, A](val _f: I => StateT[M, S, A]) extends AnyVal {
208+
@inline def liftS(implicit M: Functor[M]): I => ReactST[M, S, A] = _f(_).liftS
209209
}
210210

211-
implicit final class SzRExt_ReactSOps[S, A](val s: ReactS[S,A]) extends AnyVal {
211+
@inline implicit final class SzRExt_ReactSOps[S, A](val _r: ReactS[S,A]) extends AnyVal {
212212
// Very common case. Very sick of seeing it highlighted red everywhere in Intellij.
213-
def liftIO: ReactST[IO, S, A] = s.lift[IO]
213+
def liftIO: ReactST[IO, S, A] = _r.lift[IO]
214214
}
215215

216-
implicit final class SzRExt_ReactSTOps[M[+_], S, A](val s: ReactST[M,S,A]) extends AnyVal {
216+
@inline implicit final class SzRExt_ReactSTOps[M[+_], S, A](val _r: ReactST[M,S,A]) extends AnyVal {
217217
def addCallback(c: OpCallbackIO)(implicit M: Monad[M]): ReactST[M,S,A] =
218-
s.flatMap(ReactS.callbackT(_, c))
218+
_r.flatMap(ReactS.callbackT(_, c))
219219

220220
// This shouldn't be needed; it's already in BindSyntax.
221221
def >>[B](t: => ReactST[M,S,B])(implicit M: Bind[M]): ReactST[M,S,B] =
222-
s.flatMap(_ => t)
222+
_r.flatMap(_ => t)
223223

224224
/** zoom2 because StateT.zoom already exists. 2 because it takes two fns. */
225225
def zoom2[T](f: T => S, g: (T, S) => T)(implicit M: Functor[M]): ReactST[M, T, A] =
226-
ReactS.zoom(s, f, g)
226+
ReactS.zoom(_r, f, g)
227227

228228
def zoomU[T](implicit M: Functor[M], ev: S === Unit): ReactST[M, T, A] =
229-
ReactS.zoomU[M, T, A](ev.subst[({type λ[σ] = ReactST[M, σ, A]})#λ](s))
229+
ReactS.zoomU[M, T, A](ev.subst[({type λ[σ] = ReactST[M, σ, A]})#λ](_r))
230230
}
231231

232-
implicit final class SzRExt_CompStateAccessOps[C[_], S](val u: C[S]) extends AnyVal {
232+
@inline implicit final class SzRExt_CompStateAccessOps[C[_], S](val _c: C[S]) extends AnyVal {
233233
type CC = CompStateAccess[C]
234234

235235
private def run[M[+_], A, B](st: => ReactST[M, S, A], f: (S, S, A, => IO[Unit]) => IO[B])(implicit C: CC, M: M ~> IO): IO[B] =
236-
IO(StateAndCallbacks(C state u)).flatMap(s1 =>
236+
IO(StateAndCallbacks(C state _c)).flatMap(s1 =>
237237
M(st run s1).flatMap { case (s2, a) =>
238-
f(s1.state, s2.state, a, IO(C.setState(u, s2.state, s2.cb)))
238+
f(s1.state, s2.state, a, IO(C.setState(_c, s2.state, s2.cb)))
239239
}
240240
)
241241

‎scalaz-7.1/src/main/scala/japgolly/scalajs/react/ScalazReact.scala‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,29 @@ object ScalazReact extends vdom.ScalazImplicits {
3030
override def apply[A](a: Id[A]): IO[A] = IO(a)
3131
}
3232

33-
implicit final class SzRExt_Attr(val a: Attr) extends AnyVal {
33+
@inline implicit final class SzRExt_Attr(val _a: Attr) extends AnyVal {
3434

3535
def ~~>(io: => IO[Unit]) =
36-
a --> io.unsafePerformIO()
36+
_a --> io.unsafePerformIO()
3737

3838
def ~~>[N <: dom.Node, E <: SyntheticEvent[N]](eventHandler: E => IO[Unit]) =
39-
a.==>[N, E](eventHandler(_).unsafePerformIO())
39+
_a.==>[N, E](eventHandler(_).unsafePerformIO())
4040
}
4141

42-
implicit final class SzRExt_C_M(val u: ComponentScope_M[_]) extends AnyVal {
43-
def forceUpdateIO = IO(u.forceUpdate())
42+
@inline implicit final class SzRExt_C_M(val _c: ComponentScope_M[_]) extends AnyVal {
43+
def forceUpdateIO = IO(_c.forceUpdate())
4444
}
4545

46-
implicit final class SzRExt_SEvent[N <: dom.Node](val e: SyntheticEvent[N]) extends AnyVal {
46+
@inline implicit final class SzRExt_SEvent[N <: dom.Node](val _e: SyntheticEvent[N]) extends AnyVal {
4747
/**
4848
* Stops the default action of an element from happening.
4949
* For example: Prevent a submit button from submitting a form Prevent a link from following the URL
5050
*/
51-
def preventDefaultIO = IO(e.preventDefault())
51+
def preventDefaultIO = IO(_e.preventDefault())
5252
/**
5353
* Stops the bubbling of an event to parent elements, preventing any parent event handlers from being executed.
5454
*/
55-
def stopPropagationIO = IO(e.stopPropagation())
55+
def stopPropagationIO = IO(_e.stopPropagation())
5656
}
5757

5858
val preventDefaultIO = (_: SyntheticEvent[dom.Node]).preventDefaultIO
@@ -204,42 +204,42 @@ object ScalazReact extends vdom.ScalazImplicits {
204204
}
205205
}
206206

207-
implicit final class SzRExt_StateTOps[M[_], S, A](val s: StateT[M, S, A]) extends AnyVal {
208-
@inline def liftS(implicit M: Functor[M]): ReactST[M, S, A] = ReactS.liftS(s)
207+
@inline implicit final class SzRExt_StateTOps[M[_], S, A](val _s: StateT[M, S, A]) extends AnyVal {
208+
@inline def liftS(implicit M: Functor[M]): ReactST[M, S, A] = ReactS.liftS(_s)
209209
}
210210

211-
implicit final class SzRExt__StateTOps[I, M[_], S, A](val f: I => StateT[M, S, A]) extends AnyVal {
212-
@inline def liftS(implicit M: Functor[M]): I => ReactST[M, S, A] = f(_).liftS
211+
@inline implicit final class SzRExt__StateTOps[I, M[_], S, A](val _f: I => StateT[M, S, A]) extends AnyVal {
212+
@inline def liftS(implicit M: Functor[M]): I => ReactST[M, S, A] = _f(_).liftS
213213
}
214214

215-
implicit final class SzRExt_ReactSOps[S, A](val s: ReactS[S,A]) extends AnyVal {
215+
@inline implicit final class SzRExt_ReactSOps[S, A](val _r: ReactS[S,A]) extends AnyVal {
216216
// Very common case. Very sick of seeing it highlighted red everywhere in Intellij.
217-
def liftIO: ReactST[IO, S, A] = s.lift[IO]
217+
def liftIO: ReactST[IO, S, A] = _r.lift[IO]
218218
}
219219

220-
implicit final class SzRExt_ReactSTOps[M[_], S, A](val s: ReactST[M,S,A]) extends AnyVal {
220+
@inline implicit final class SzRExt_ReactSTOps[M[_], S, A](val _r: ReactST[M,S,A]) extends AnyVal {
221221
def addCallback(c: OpCallbackIO)(implicit M: Monad[M]): ReactST[M,S,A] =
222-
s.flatMap(ReactS.callbackT(_, c))
222+
_r.flatMap(ReactS.callbackT(_, c))
223223

224224
// This shouldn't be needed; it's already in BindSyntax.
225225
def >>[B](t: => ReactST[M,S,B])(implicit M: Bind[M]): ReactST[M,S,B] =
226-
s.flatMap(_ => t)
226+
_r.flatMap(_ => t)
227227

228228
/** zoom2 because StateT.zoom already exists. 2 because it takes two fns. */
229229
def zoom2[T](f: T => S, g: (T, S) => T)(implicit M: Functor[M]): ReactST[M, T, A] =
230-
ReactS.zoom(s, f, g)
230+
ReactS.zoom(_r, f, g)
231231

232232
def zoomU[T](implicit M: Functor[M], ev: S === Unit): ReactST[M, T, A] =
233-
ReactS.zoomU[M, T, A](ev.subst[({type λ[σ] = ReactST[M, σ, A]})#λ](s))
233+
ReactS.zoomU[M, T, A](ev.subst[({type λ[σ] = ReactST[M, σ, A]})#λ](_r))
234234
}
235235

236-
implicit final class SzRExt_CompStateAccessOps[C[_], S](val u: C[S]) extends AnyVal {
236+
@inline implicit final class SzRExt_CompStateAccessOps[C[_], S](val _c: C[S]) extends AnyVal {
237237
type CC = CompStateAccess[C]
238238

239239
private def run[M[_], A, B](st: => ReactST[M, S, A], f: (S, S, A, => IO[Unit]) => IO[B])(implicit C: CC, M: M ~> IO): IO[B] =
240-
IO(StateAndCallbacks(C state u)).flatMap(s1 =>
240+
IO(StateAndCallbacks(C state _c)).flatMap(s1 =>
241241
M(st run s1).flatMap { case (s2, a) =>
242-
f(s1.state, s2.state, a, IO(C.setState(u, s2.state, s2.cb)))
242+
f(s1.state, s2.state, a, IO(C.setState(_c, s2.state, s2.cb)))
243243
}
244244
)
245245

0 commit comments

Comments
 (0)