Commit Graph

6090 Commits

Author SHA1 Message Date
Dale Wijnand 2e86eed151
Split BuildSettingsInstances out of SlashSyntaxSpec.scala 2018-03-27 16:32:34 +01:00
Dale Wijnand 165aac858e
Merge pull request #4040 from dwijnand/dedup/SlashSyntaxSpec
Dedup keys in SlashSyntaxSpec
2018-03-27 14:54:59 +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 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 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
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 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
Dale Wijnand a85d7606f3
Merge pull request #3994 from fmlrt/in_configuration_scope_filter_factories
Add more configuration axis ScopeFilter factory methods
2018-03-08 11:26:38 +00:00
eugene yokota ec93e3e9d5
Merge pull request #3947 from exoego/global-eviction-warning-options
Add the eviction warnings options to global
2018-03-07 20:40:24 -05:00
TATSUNO Yasuhiro 68f58aba87
Merge branch '1.x' into global-eviction-warning-options 2018-03-08 09:18:53 +09:00
eugene yokota 051d09e921
Merge pull request #3998 from eed3si9n/wip/fix-3143
Add test to confirm leak is gone
2018-03-07 18:16:58 -05:00
exoego dc4f93a7c3 Remove unnecessary GlobalScope 2018-03-08 08:14:39 +09:00
eugene yokota 92c95ce290
Merge pull request #3997 from eed3si9n/wip/test-status-thread-safety
Fix race condition in non-forked, parallel tests.
2018-03-07 16:18:55 -05:00
jvican f24e5f2136 Add test to confirm leak is gone
The following commit adds the test case used to report #3143 in a big
projects with lots of cross versions and modules. The execution of the
test is instant!
2018-03-07 16:15:29 -05:00
Eugene Yokota 49b4c3a3e0 mima 2018-03-07 15:31:24 -05:00
Dale Wijnand 10275489d8
Merge pull request #3987 from dwijnand/document-Rich-Init-classes
Document RichInitX classes
2018-03-07 09:44:19 +00:00
Dale Wijnand 7258f5836e
Merge pull request #3988 from dwijnand/scripted-cleanups
Cleanups from my recent work in scripted
2018-03-07 09:39:40 +00:00
eugene yokota 4858c0772f
Merge pull request #3996 from itohiro73/fix-contributing
Fix #3990: Add CLA instruction to CONTRIBUTING.md
2018-03-07 01:23:06 -05:00
Hiroshi Ito 1fef1a5a6a Fix #3990: Add CLA instruction to CONTRIBUTING.md 2018-03-07 11:14:49 +09:00
Rui Gonçalves 251e5ab26e
Filter incompatible aggregates in cross switch commands 2018-03-07 00:27:22 +00:00
Maksym Fedorov 15f4498494 Add more configuration axis ScopeFilter factory methods 2018-03-06 23:01:31 +01:00
Dale Wijnand 26014a527e
Use Def.settings (bikeshed) 2018-03-06 19:20:33 +00:00
Dale Wijnand 4b36bca5ec
Fix label so it's copy-and-paste-able 2018-03-06 11:59:49 +00:00
Dale Wijnand 359a0109fd
Cleanup & simplify actions/generator 2018-03-06 11:59:48 +00:00
Dale Wijnand 3791e489b2
Use Def.settings in build.sbt 2018-03-06 11:59:27 +00:00
Dale Wijnand a69c3d6e13
Format build.sbt 2018-03-06 11:59:27 +00:00
Dale Wijnand 621ad2b553
Cleanup TaskNegSpec 2018-03-06 11:59:27 +00:00
Dale Wijnand 7b11729f8c
Cleanup State#process 2018-03-06 11:59:26 +00:00
Dale Wijnand 685b416b8e
Cleanup Main 2018-03-06 11:59:26 +00:00
Dale Wijnand 2effe0845f
Cleanup IPC 2018-03-06 11:59:26 +00:00
Dale Wijnand 89e501443c
Cleanup SbtHandler 2018-03-06 11:59:26 +00:00
Dale Wijnand 4debec0053
Cleanup ScriptedTests 2018-03-06 11:54:14 +00:00
Dale Wijnand cb2e4e67fd
Cleanup BatchScriptRunner 2018-03-06 11:54:13 +00:00
Dale Wijnand b8abf4285f
Make BatchScriptRunner.States hold StatementHandler#State 2018-03-06 11:54:13 +00:00
Dale Wijnand 9d808a389c
Update PublishBinPlugin to current sbt 2018-03-06 11:54:13 +00:00