Commit Graph

17940 Commits

Author SHA1 Message Date
eugene yokota 164b29da22
Merge pull request #3777 from eed3si9n/wip/vsc-definition
textDocument/definition for LSP / VS Code
2017-11-28 14:47:09 -05:00
wpopielarski 452e97e41d Adds backticks to class/trait/object name.
Adapts tests to changed specs2 dependency.

Tiny fixes.

Removes Scala IDE compiler clues.
2017-11-28 13:27:15 -05:00
wpopielarski 73b0034cfc textDocument/definition for LSP / VS Code
This is an implementation of `textDocument/definition` request.
Supports types only, and only in case when type is found in Zinc Analysis. When source(s) are found then editor opens potential source(s).
This simple implementation does not use semantic data.

During the processing of `textDocument/didSave`, we will start collecting the location of Analysis files via `lspCollectAnalyses`.
Later on, when the user asked for `textDocument/definition`, sbt server will invoke a Future call to lspDefinition, which direct reads the files to locate the definition of a class.
2017-11-28 13:27:07 -05:00
Dale Wijnand 9c32c16ade
Create RunFromSourceMain & "sbtOn" command 2017-11-28 17:27:02 +00:00
Dale Wijnand 297fd5d24b
Merge pull request #3742 from eed3si9n/wip/socket
IPC Unix domain socket / Windows named pipe
2017-11-28 16:04:11 +00:00
Dale Wijnand 8c1e062fd1 Support scala 2.13.0-pre-* & 2.13.0-M1
Fixes sbt/sbt#3771
Fixes sbt/zinc#460
2017-11-28 15:34:34 +00:00
Dale Wijnand ee90917cc4
Alt scala parser sync workaround
Apply retronym's suggestion at https://github.com/scala/bug/issues/10605
instead of the workaround merged in https://github.com/sbt/sbt/pull/3743.
2017-11-28 12:00:38 +00:00
Eugene Yokota ef61a1efa7 Read just the amount of bytes available 2017-11-27 21:37:37 -05:00
Eugene Yokota f785750fc4 IPC Unix domain socket for sbt server
In addition to TCP, this adds sbt server support for IPC (interprocess communication) using Unix domain socket and Windows named pipe.

The use of Unix domain socket has performance and security benefits.
2017-11-27 21:37:31 -05:00
Eugene Yokota 0c803214aa IPC Unix Domain Socket and Windows Named Pipe sockets
The Java socket implementation for IPC is lifted from facebook/nailgun.

af623fdded/
2017-11-27 21:36:25 -05:00
eugene yokota e6165464ba
Merge pull request #3740 from laughedelic/wip/logmessage
LSP: improve logMessage notifications
2017-11-27 20:51:50 -05:00
Dale Wijnand 5b0b9e2ba2
Add node_modules to .gitignore 2017-11-27 16:52:48 +00:00
Dale Wijnand ac5a30142a
Merge pull request #3770 from xuwei-k/specs2-4
update specs2 4.0.1
2017-11-26 09:15:28 +00:00
eugene yokota 8e933fcda4
Merge pull request #3768 from eed3si9n/wip/bump_modules
Bump modules
2017-11-26 03:49:14 -05:00
Eugene Yokota 1d8d1a1622 Zinc 1.0.5 2017-11-26 02:26:04 -05:00
xuwei-k 6b4093dc15 update specs2 4.0.1 2017-11-26 13:59:50 +09:00
Eugene Yokota f44dcef14d notes 2017-11-25 05:26:51 -05:00
Eugene Yokota 309fdfac31 Bump modules 2017-11-25 00:27:45 -05:00
eugene yokota 3c430d00cf
Merge pull request #185 from eed3si9n/wip/formatting_issue
Formatting
2017-11-24 20:49:17 -05:00
Eugene Yokota df177ff56e Formatting 2017-11-24 20:16:36 -05:00
eugene yokota a8b53a23be
Merge pull request #184 from eed3si9n/wip/bump_util
Bump IO and Util
2017-11-24 17:26:27 -05:00
eugene yokota 50d024ac60
Merge pull request #183 from tpunder/fm-sbt-s3-resolver-conflict-fix
Be friendly to SBT plugins that also use URLHandlerRegistry.setDefault
2017-11-24 17:26:09 -05:00
Eugene Yokota 7f3954d8bb Bump IO and Util 2017-11-24 17:14:46 -05:00
Dale Wijnand 7e855b8323 Merge branch '1.0.x' into merge-1.0.x-into-1.x
* 1.0.x: (28 commits)
  Split compiler bridge tests to another subproject
  Implement compiler bridge for 2.13.0-M2
  Add yourkit acknoledgement in the README
  "sbt '++ 2.13.0-M2!' compile" does not work with sbt 1.0.0
  Add header to cached hashing spec
  Add headers to missing files
  Fix #332: Add sbt-header back to the build
  Update sbt-scalafmt to 1.12
  Make classpath hashing more lightweight
  Fix #442: Name hash of value class should include underlying type
  source-dependencies/value-class-underlying: fix test
  Ignore null in generic lambda tparams
  Improve and make scripted parallel
  Fix #436: Remove annoying log4j scripted exception
  Fix #127: Use `unexpanded` name instead of `name`
  Add pending test case for issue/127
  source-dependencies / patMat-scope workaround
  Fixes undercompilation on inheritance on same source
  Add real reproduction case for sbt/zinc#417
  Add trait-trait-212 for Scala 2.12.3
  ...

 Conflicts:
	internal/zinc-apiinfo/src/main/scala/sbt/internal/inc/ClassToAPI.scala
	project/build.properties
	zinc/src/main/scala/sbt/internal/inc/MixedAnalyzingCompiler.scala

The ClassToAPI conflict is due to:
* https://github.com/sbt/zinc/pull/393 (a 1.x PR), conflicting with
* https://github.com/sbt/zinc/pull/446 (a 1.0.x PR).

The build.properties conflict is due to different PRs bumping
sbt.version from 1.0.0 to 1.0.2 to 1.0.3. (#413, #418, #453).

The MixedAnalyzingCompiler conflict is due to:
* https://github.com/sbt/zinc/pull/427 (a 1.x PR), conflicting with
* https://github.com/sbt/zinc/pull/452 (a 1.0.x PR).
2017-11-23 12:30:03 +00:00
Dale Wijnand c517517927
Merge pull request #3754 from Duhemm/remove-useless-files
Remove 2 useless files in protocol
2017-11-23 12:22:15 +00:00
Dale Wijnand 97a2fe8c1c
Merge pull request #3762 from xuwei-k/fix-screpl
fix #3591. "Not a valid key: console-quick"
2017-11-23 09:58:36 +00:00
Dale Wijnand d45f817b71
Merge pull request #3763 from xuwei-k/Completions-strict
make strict some methods in Completions
2017-11-23 09:56:04 +00:00
xuwei-k b8086e0768 make strict some methods in Completions 2017-11-23 15:21:02 +09:00
xuwei-k 8ee413778a fix #3591. "Not a valid key: console-quick" 2017-11-23 14:56:52 +09:00
Tim Underwood 8330d16431 Be friendly to SBT plugins that also use URLHandlerRegistry.setDefault
Other plugins (for example: https://github.com/frugalmechanic/fm-sbt-s3-resolver)
also make use of the URLHandlerRegistry.setDefault mechanism to register handlers
for other protocols (e.g. "s3").  This change makes it so that SBT will only
register the http/https protocols and will preserve any other protocol handlers
that have already been registered.
2017-11-22 10:50:19 -08:00
Eugene Yokota 282b0f7f51 Split compiler bridge tests to another subproject
Splitting compiler bridge tests to another subproject because while the bridge itself can be compiled with just compiler-interface, util-interface, and Scala Compiler as dependencies, the testing introduces more (such as IO). This creates problem for new Scala versions where IO or test libraries do not exist yet (e.g. Scala 2.13.0-M2).

This also removes the Mima test due to the lack of 2.13 bridge for Zinc 1.0.0.
Compiler bridge just needs to compile itself against the interface and Scala compiler, so there's no need to run Mima test.
2017-11-21 11:52:03 -05:00
Martin Duhem 238540d34a
Remove 2 useless files in protocol
They have been moved to Contraband since, but never removed.
2017-11-21 10:46:57 +01:00
Dale Wijnand 17762947e4
Merge pull request #3744 from cunei/wip-port-zinc-pr-441
Port of sbt/zinc#441 to sbt/sbt 1.0.x
2017-11-16 16:29:15 +00:00
Dale Wijnand 7d70f0966c
Merge pull request #199 from thatfulvioguy/use-expr-over-bc
Use expr instead of bc when checking Java versions.
2017-11-16 16:21:28 +00:00
Fulvio Valente 6ad16c2b74 Use expr instead of bc when checking Java versions.
Because expr is in coreutils, we can expect it to be present on systems unlike bc.

Fixes #198
Fixes #192
2017-11-16 15:11:19 +00:00
Antonio Cunei 43a976d42c Port of sbt/zinc#441 to sbt/sbt 1.0.x 2017-11-16 15:15:21 +01:00
Dale Wijnand efdc7c90ca
Merge pull request #197 from mkurz/debugFix
Ignore debug output when getting runtime jar path
2017-11-16 11:09:17 +00:00
Dale Wijnand 096a0d83b2
Update sbt.build.version in CONTRIBUTING too. 2017-11-16 11:02:18 +00:00
Dale Wijnand 749a1b7f27
Merge pull request #196 from javabrett/add-travis-build-image
Updated README.md to add a Travis build status image, fixed Travis build
2017-11-16 11:01:46 +00:00
Dale Wijnand 8fe38d4a5a
Merge pull request #3743 from cunei/wip-flakyTests1
Workaround for scala/bug#10605
2017-11-16 10:58:53 +00:00
Brett Randall 8f276e95e0 Set compatible build properties, sbt version (1.0.3) to fix Travis build. Added required fakeroot package.
Fixed #180.
2017-11-15 11:38:53 -05:00
Dale Wijnand 9e0d9dd775
Merge pull request #182 from dwijnand/ivy
Bump to latest Ivy
2017-11-15 16:08:05 +00:00
Dale Wijnand f4241c4d65
Bump to latest Ivy
Includes sbt/ivy#27 which fixes a JDK 9 issue.
Similar to PR sbt/launcher#46.
2017-11-15 15:58:29 +00:00
Matthias Kurz 006a5eee23
Ignore debug output when getting runtime jar path 2017-11-15 11:55:12 +01:00
Antonio Cunei a050b73a46 Workaround for scala/bug#10605
templateStats() is not thread-safe in 2.12.x (at least up to 2.12.4)
2017-11-15 05:27:31 +01:00
Alexey Alekhin 8fe1934ea0 Tweaked MessageType.fromLevelString conversion 2017-11-14 21:53:57 +01:00
Alexey Alekhin 0c0e0ce912 Log StringEvents and MessageEvents to the LSP client 2017-11-14 21:53:29 +01:00
Alexey Alekhin 6b6047b55c Publish ExecStatusEvent taking into account its channel name 2017-11-14 21:53:15 +01:00
Dale Wijnand 320d993fa6
Merge pull request #195 from javabrett/refer-jdk-not-jre
Changed references to downloading/installing/updating Java (JRE?) to …
2017-11-13 11:50:02 +00:00
Dale Wijnand 163e8bff82
Merge pull request #181 from xuwei-k/java-9
add Java 9 test
2017-11-13 08:09:23 +00:00