luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,268 Commits 29 Branches 314 Tags 75 MiB
Commit Graph

6268 Commits

Author SHA1 Message Date
Dale Wijnand d19329666a
Re-use Scoped.scoped* methods 2018-03-27 09:24:12 +01:00
Dale Wijnand 3c66f39744
Allow SlashSyntaxSpec to be Scalafmt formatted 
Previously:

    [warn] /d/sbt/main-settings/src/test/scala/sbt/SlashSyntaxSpec.scala:44: error: illegal start of simple expression
    [warn] )
    [warn]     ^
 2018-03-27 09:22:07 +01:00
Dale Wijnand 42b61a4f8e
Dedup keys in SlashSyntaxSpec 2018-03-27 09:22:06 +01:00
Dale Wijnand 51ff72872b
De-generalise expectValue in SlashSyntaxSpec 2018-03-27 09:22:06 +01:00
Dale Wijnand 006527d246
Re-order SlashSyntaxSpec arbitraries 2018-03-27 09:22:06 +01:00
Dale Wijnand b0f9fe77b6
Merge pull request #4036 from eed3si9n/wip/fix-startup-log 
Fixes -error not suppressing startup logs
 2018-03-26 15:28:50 +01:00
eugene yokota cd40d1ac77
Merge pull request #4031 from eed3si9n/wip/bump 
bump modules
 2018-03-26 10:26:25 -04:00
Eugene Yokota 25ab94d96a Fixes -error not suppressing startup logs 
Fixes #3849

This brings back the 0.13 logic:

```scala
  def setGlobalLogLevel(s: State, level: Level.Value): State = {
    s.globalLogging.full match {
      case a: AbstractLogger => a.setLevel(level)
      case _                 => ()
    }
    s.put(BasicKeys.explicitGlobalLogLevels, true).put(Keys.logLevel.key, level)
  }
```
 2018-03-25 14:56:00 -04:00
Dale Wijnand 131c2a7a68
Merge pull request #4033 from eed3si9n/wip/new-mess 
Fixes new command leaving behind target directory
 2018-03-24 22:57:41 +00:00
Eugene Yokota b111b05d5f Fixes new command leaving target directory 
Fixes #2835

This fixes `new` command creating `target` directory by moving the `target` to a staging directory in the command itself.
 2018-03-24 13:45:35 -04:00
Eugene Yokota 67e1e4a9ff improve server testing 
previously I was using separate thread in a forked test to test the server, but that is not enough isolation to run multiple server tests.
This adds `RunFromSourceMain.fork(workingDirectory: File)`, which allows us to run a fresh sbt on the given working directory. Next, I've refactored the stateful client-side buffer to a class `TestServer`.
 2018-03-24 12:09:41 -04:00
Eugene Yokota 9d2d81645b bump modules 2018-03-24 11:02:40 +09:00
Dale Wijnand a43c18e4f9
Merge pull request #4030 from eatkins/vector-1.1 
Vector 1.1
 2018-03-23 11:50:34 +00:00
Ethan Atkins 9b24e9f9eb Use ConcurrentLinkedDeque for EventHandler 
ArrayList::add is not thread safe. I ran into cases where async tests
using utests would fail even when all of the individual tests passed.
This was because multiple threads called back into the handle method of
the handler instance variable, which just delegated to eventList::add.
When this happened, one of the events would get added to the list as a
null reference, which would manifest as an NPE upstream on the master
process. After this change, my tests stopped failing.
 2018-03-21 10:50:30 -07:00
Ethan Atkins 8eb2d7389d Add test for async utest TestSuites 
Sometimes when utest runs async tests (i.e. tests that return a future)
the test suite will fail even when none of the individual tests do. This
is due to a data race in sbt. Most, but not all, of the time, this test
will induce that race.
 2018-03-21 10:41:41 -07:00
Dale Wijnand ca874d5d5f
Merge pull request #4017 from dwijnand/cleanup/CommandChannel 
Cleanup CommandChannel
 2018-03-20 11:05:16 +00:00
Dale Wijnand 00ce32f102
Cleanup CommandChannel 2018-03-20 09:17:55 +00:00
Dale Wijnand fe418c92a7
Merge pull request #4016 from dwijnand/cleanup/Watched 
Make Watched use State#handleError
 2018-03-20 08:54:18 +00:00
Dale Wijnand b23980ce1b
Merge pull request #4018 from dwijnand/cleanup/NetworkChannel 
Cleanup NetworkChannel
 2018-03-20 08:54:04 +00:00
Dale Wijnand 9c0ac90ee9
Make Watched use State#handleError 2018-03-19 15:21:15 +00:00
Dale Wijnand 6ceed00f48
Cleanup NetworkChannel 2018-03-19 15:11:39 +00:00
Dale Wijnand c6df309073
Merge pull request #4025 from tiqwab/fix-parsing-id 
Fix handling id in jsonrpc model
 2018-03-18 16:35:44 +00:00
Naohisa Murakami 9d01bdff68
Merge pull request #1 from eed3si9n/wip/fix-parsing-id 
Add test case for number id in JSON-RPC
 2018-03-18 07:38:25 +09:00
Eugene Yokota e5d2588927 Add test case for number id in JSON-RPC 2018-03-18 02:11:23 +09:00
tiqwab a5119a411c Fix handling id in jsonrpc model 
Fix #3861
 2018-03-17 22:41:47 +09:00
Dale Wijnand 6abf4c9e00
Merge pull request #4022 from tmiyamon/support-vscode-test-compile 
support test compile on saving in vscode
 2018-03-16 10:12:32 +00:00
tmiyamon 77ffbe896d support test compile on saving in vscode 2018-03-16 18:03:52 +09:00
eugene yokota 571417dc6f
Merge pull request #4019 from itohiro73/improve-contributing 
Improve instruction for locally built sbt in CONTRIBUTING.md
 2018-03-16 15:24:22 +09:00
Hiroshi Ito 04ab2d30e1 Improve instruction for locally built sbt in CONTRIBUTING.md 2018-03-16 15:07:17 +09:00
eugene yokota 4efce7e877
Merge pull request #3991 from dwijnand/ExecStatusEvent-exitCode 
Add an optional exitCode to ExecStatusEvent so clients can use it
 2018-03-16 00:27:17 +09:00
Dale Wijnand 933668076a
Merge pull request #3989 from dwijnand/cleanup-lsp 
Cleanup some parts of the LSP impl
 2018-03-15 13:57:44 +00:00
Dale Wijnand 5f56fa9f14
Extract serializeResponse 2018-03-15 12:55:21 +00:00
Dale Wijnand d3ef452a5f
Extract jsonRpcRespondErrorImpl 2018-03-15 12:55:21 +00:00
Dale Wijnand 268b5111ab
Format LSP methods 2018-03-15 12:55:21 +00:00
Dale Wijnand de690f4e41
Collapse 1-line scaladocs 2018-03-15 12:55:20 +00:00
Dale Wijnand 087f21741d
Merge pull request #3975 from eed3si9n/wip/serverext 
make sbt server extensible
 2018-03-15 01:58:07 +00:00
Dale Wijnand 98332c0891
Reply to sbt/exec w/ a Response/Error w/ error code 2018-03-14 13:56:29 +00:00
Dale Wijnand bde6365013
Add an optional exitCode to ExecStatusEvent so clients can use it 2018-03-14 11:56:51 +00:00
Dale Wijnand 7baf97d2a6
Introduce ErrorCodes.UnknownError 
Defined in the application defined errors range.
 2018-03-14 11:56:51 +00:00
Dale Wijnand 3530349e9a
Rename ErrorCodes' UnknownErrorCode to UnknownServerError 
Allows for a non-server-specific unknown error code to be defined.
 2018-03-14 11:56:50 +00:00
Dale Wijnand 8972287892
Cleanup ErrorCodes 2018-03-14 11:56:29 +00:00
Eugene Yokota 0433440c59 move ServerHandler to internal per review 2018-03-13 23:42:40 +09:00
Eugene Yokota f13465246c include the full body in debug message 2018-03-13 23:02:45 +09:00
Eugene Yokota cd9f0d2711 make sbt server extensible 
Fixes #3890

Here's an example:

```scala
    Global / serverHandlers += ServerHandler({ callback =>
      import callback._
      import sjsonnew.BasicJsonProtocol._
      import sbt.internal.protocol.JsonRpcRequestMessage
      ServerIntent(
        {
          case r: JsonRpcRequestMessage if r.method == "lunar/helo" =>
            jsonRpcNotify("lunar/oleh", "")
            ()
        },
        PartialFunction.empty
      )
```
 2018-03-13 23:02:45 +09:00
Dale Wijnand dd4de14593
Upgrade to contraband 0.4.0 2018-03-12 15:39:07 +00:00
Eugene Yokota b82a1870a7 add tests around scope delegation 2018-03-10 17:24:39 -05:00
eugene yokota 3559de06aa
Merge pull request #3999 from eed3si9n/wip/cache-watch-service 
[bport] Cache watch service
 2018-03-09 17:42:11 -05:00
Ethan Atkins 5df1d8e23f Cache watch service 
I noticed that my custom WatchService was never cleaned up by sbt and
realized that after every build we were making a new WatchService. At
the same time, we were reusing the WatchState from the previous run,
which was using the original WatchService. This was particularly
problematic because it prevented us from registering any paths with the
new watch service. This may have prevented some of the file updates
from being seen by the watch service. Moreover, because we lost the
reference to the original WatchService, there was no way to clean it up,
which was a resource leak.

May be related to #3775, #3695
 2018-03-09 06:11:52 -05:00
Dale Wijnand ed5a8c118b
Upgrade to contraband 0.3.3 2018-03-08 12:49:38 +00:00
Dale Wijnand 80d342a811
Merge pull request #3995 from ruippeixotog/cross-strict-aggregation 
Filter incompatible aggregates in cross switch commands
 2018-03-08 11:27:55 +00:00