Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Color REPL #63

Merged
merged 2 commits into from
Sep 24, 2014
Merged

Color REPL #63

merged 2 commits into from
Sep 24, 2014

Conversation

puffnfresh
Copy link

screen shot 2014-09-22 at 9 14 21 am

@puffnfresh
Color REPL under -Dscala.color
9902ae5 
We already use -Dscala.color when using -Ytyper-debug

This tries to reuse the colors chosen from the debug flag:

* Bold blue for vals (e.g. "res0")
* Bold green for types (e.g. "Int")
* Magenta for the shell prompt (e.g. "scala>")
@puffnfresh
Automatically enable color REPL if JLine says so
38e2107
@paulp
Copy link

paulp commented Sep 24, 2014

Aaagh my eyes!

Just kidding.

@som-snytt
Copy link

I can't wait to see partest running ReplTest in testicolor. What are the colors in the diff?

@puffnfresh
Copy link
Author

@som-snytt the check is isAnsiSupported - think that'll be true in the tests? I wouldn't have thought so.

@som-snytt
Copy link

It's just a flag.

https://github.com/jline/jline2/blob/master/src/main/java/jline/UnixTerminal.java#L49

But I guess the check files can't be colorblind, unless partest strips the escs for the diff.

JLine supports both color and sound.

http://images.cdbaby.name/j/l/jline6_large.jpg?v=0d88b086-8e9c-46e8-b0d0-c980f04e228b

@puffnfresh
Copy link
Author

@som-snytt the ReplTest cases passed, dunno how.

non added a commit that referenced this pull request Sep 24, 2014
@non
Merge pull request #63 from puffnfresh/feature/color-repl-auto
379af13 
Color REPL
@non non merged commit 379af13 into typelevel:2.11.x Sep 24, 2014
@som-snytt som-snytt mentioned this pull request Feb 3, 2015
Merged
milessabin pushed a commit that referenced this pull request Jul 31, 2017
@retronym
Avoid non-local return in typedSelect
6c080c2 
Non local returns aren't eliminated after inlined in 2.11 or 2.12

```
⚡ scala
Welcome to Scala 2.12.1 (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_112).
Type in expressions for evaluation. Or try :help.

scala> @inlune def foo(a: => Any) = if ("".isEmpty) a else ""
<console>:11: error: not found: type inlune
       @inlune def foo(a: => Any) = if ("".isEmpty) a else ""
        ^

scala> @inline def foo(a: => Any) = if ("".isEmpty) a else ""
foo: (a: => Any)Any

scala> class InlineReturn { def test: Any = foo(return "") }
defined class InlineReturn

scala> :javap -c InlineReturn#test
  public java.lang.Object test();
    Code:
       0: new           #4                  // class java/lang/Object
       3: dup
       4: invokespecial #32                 // Method java/lang/Object."<init>":()V
       7: astore_1
       8: getstatic     #36                 // Field $line4/$read$$iw$$iw$.MODULE$:L$line4/$read$$iw$$iw$;
      11: aload_1
      12: invokedynamic #59,  0             // InvokeDynamic #0:apply:(Ljava/lang/Object;)Lscala/Function0;
      17: invokevirtual #63                 // Method $line4/$read$$iw$$iw$.foo:(Lscala/Function0;)Ljava/lang/Object;
      20: goto          44
      23: astore_2
      24: aload_2
      25: invokevirtual #66                 // Method scala/runtime/NonLocalReturnControl.key:()Ljava/lang/Object;
      28: aload_1
      29: if_acmpne     39
      32: aload_2
      33: invokevirtual #69                 // Method scala/runtime/NonLocalReturnControl.value:()Ljava/lang/Object;
      36: goto          41
      39: aload_2
      40: athrow
      41: goto          44
      44: areturn
    Exception table:
       from    to  target type
           8    20    23   Class scala/runtime/NonLocalReturnControl
```

```
⚡ ~/scala/2.11.8/bin/scala
Welcome to Scala 2.11.8 (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_112).
Type in expressions for evaluation. Or try :help.

scala> @inline def foo(a: => Any) = if ("".isEmpty) a else ""
foo: (a: => Any)Any

scala> class InlineReturn { def test: Any = foo(return "") }
defined class InlineReturn

scala> :javap -c InlineReturn#test
  public java.lang.Object test();
    Code:
       0: new           #4                  // class java/lang/Object
       3: dup
       4: invokespecial #13                 // Method java/lang/Object."<init>":()V
       7: astore_1
       8: getstatic     #19                 // Field .MODULE$:L;
      11: new           #21                 // class InlineReturn$$anonfun$test$1
      14: dup
      15: aload_0
      16: aload_1
      17: invokespecial #24                 // Method InlineReturn$$anonfun$test$1."<init>":(LInlineReturn;Ljava/lang/Object;)V
      20: invokevirtual #28                 // Method .foo:(Lscala/Function0;)Ljava/lang/Object;
      23: goto          39
      26: astore_2
      27: aload_2
      28: invokevirtual #31                 // Method scala/runtime/NonLocalReturnControl.key:()Ljava/lang/Object;
      31: aload_1
      32: if_acmpne     40
      35: aload_2
      36: invokevirtual #34                 // Method scala/runtime/NonLocalReturnControl.value:()Ljava/lang/Object;
      39: areturn
      40: aload_2
      41: athrow
    Exception table:
       from    to  target type
           8    26    26   Class scala/runtime/NonLocalReturnControl

scala> :quit
```
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@puffnfresh @paulp @som-snytt @non