Commit Graph

11969 Commits

Author SHA1 Message Date
eugene yokota 034bfb45be
Merge pull request #4349 from kai-chi/patch-1
fix branch name in CONTRIBUTING
2018-09-10 23:32:56 -04:00
Kajetan Maliszewski 6fa6c1bf7b
fix branch name in CONTRIBUTING 2018-09-10 16:18:40 +02:00
Guillaume Martres 0dc3f39ab2 Fix second part of #4091: server responses should not be broadcasted
Change CommandExchange#publishEvent to not broadcast ExecStatusEvent and
instead check the channelName, this matches what was already done in
CommandExchange#publishEventMessage
2018-09-05 18:34:03 +02:00
eugene yokota c1a00959a5
Merge pull request #4345 from eed3si9n/wip/link
Fix CONTRIBUTING and link to it
2018-09-04 23:28:06 -04:00
Eugene Yokota d40d3fe299 Fix CONTRIBUTING and link to it
Fixes #4338
2018-09-04 23:25:42 -04:00
Ignasi Marimon-Clos 66b485f559 Duplicate reports for backwards-compat adding a name-compliant copy 2018-09-04 18:15:30 +02:00
eugene yokota 965de89c64
Merge pull request #176 from sbt/1.2.x
Merge 1.2.x
2018-08-29 03:27:16 -04:00
eugene yokota 94cb6bfbb7
Merge pull request #175 from smarter/followup-range
Follow-up to the fields added in #173, and add Problem#rendered
2018-08-29 01:43:09 -04:00
eugene yokota eb6cdf77d9
Merge pull request #174 from eed3si9n/wip/format
Formatting
2018-08-29 01:41:59 -04:00
Ethan Atkins 88aa60ea49 Add an implicit class for StateOps
The State file in intellij was littered with red squiggly lines wherever
the extension methods of State called a different extension method of
State.  These went away when I switched to an implicit class, which is
the preferred way of adding extension methods since scala 2.10. As a
bonus, I was able to switch the implicit class to be a value class, so
it should not actually make a new object in most use cases.

I had to re-implement the stateOps method to delegate to the implicit
class for binary compatibility.
2018-08-28 15:45:54 -07:00
Guillaume Martres 2c64c0c9b5 Add scalaCompilerBridgeBinaryJar task
The end goal is to rewrite Dotty's compiler-bridge in Java (this is easy
since the zinc-specific phases are in the compiler itself) to simplify
the bootstrapping process.
2018-08-28 17:44:58 +09:00
Guillaume Martres 15522a0cbe Add Problem#rendered to customize how problems are shown
Dotty has its own logic for displaying problems with the proper file
path, position, and caret, but if we store this information in
Problem#message we end up with duplicated information in the output
since Zinc will prepend/append similar things (see
sbt.internal.inc.ProblemStringFormats). So far, we worked around this in
Dotty by using an empty position in the sbt bridge reporter, but this
means that crucial semantic information that could be used by a Build
Server Protocol implementation and other tools is lost. This commit
allows us to avoid by adding an optional `rendered` field to `Problem`:
when this field is set, its value controls what the user sees, otherwise
we fallback to the default behavior (the logic to do this will be added to
Zinc after this PR is merged and a new release of sbt-util is made).
2018-08-28 03:58:15 +09:00
Guillaume Martres e905b44a33 Follow-up to the fields added in #173
It turns out that there is more boilerplate to fill that I missed.

Also add deprecation notices.
2018-08-28 02:04:10 +09:00
Guillaume Martres a90675635f 1.2.2-SNAPSHOT 2018-08-28 01:27:56 +09:00
Johannes Rudolph 5ef1db0a9d
Prepare 0.9.2 2018-08-26 19:18:59 +02:00
eugene yokota 4c3cd4e535
Merge pull request #4331 from eed3si9n/wip/allfix
Fix single repo emulation script
2018-08-24 11:43:14 -04:00
Eugene Yokota f4ae038023 Fix single repo emulation script
Fixes #4330
Ref 5b179a2611 (diff-fdc3abdfd754eeb24090dbd90aeec2ce)
2018-08-24 06:25:40 -04:00
Johannes Rudolph e4943b2163
Merge pull request #161 from jrudolph/update-sbt
Update sbt to 1.2.1
2018-08-23 22:32:26 +02:00
Johannes Rudolph 41caf67757
Also run with latest sbt 1.2.1 2018-08-23 22:22:07 +02:00
Johannes Rudolph 1d8649ea6e
Merge pull request #159 from jrudolph/fix-95
Don't fail in parsing when whatDependsOn is called without running any other command first, fixes #95
2018-08-23 22:14:01 +02:00
Johannes Rudolph 9a5d51902b
Merge pull request #160 from jrudolph/add-travis-caching
Add travis caching
2018-08-23 22:13:49 +02:00
Johannes Rudolph 06c3503e1b
Build with latest sbt 1.2.1 2018-08-23 17:07:50 +02:00
Johannes Rudolph 59fe1b6b5e
add travis caching 2018-08-23 17:04:40 +02:00
Johannes Rudolph 6b176a9ca1
Don't fail in parsing when whatDependsOn is called without running any other command first, fixes #95
If no other command was run first, tab completion runs now in degraded mode
again, not showing any concrete suggestions but just the general syntax.

This probably regressed in #155 where I probably couldn't remember the reason
for the fallback...
2018-08-23 16:53:32 +02:00
Nepomuk Seiler 3a7d602b04 FIX #1972 add notes 2018-08-22 18:11:20 +02:00
Nepomuk Seiler 5989d07249 FIX #1972 fix lost package mappings with identical source file 2018-08-22 18:05:49 +02:00
Nepomuk Seiler 4b3b01b959 FIX #1972 add regression test 2018-08-22 17:18:54 +02:00
eugene yokota d08e40bdba
Merge pull request #4325 from eed3si9n/wip/merge-1.2.x
merge 1.2.x
2018-08-16 23:38:47 -04:00
eugene yokota 6eb3d9f0fb
Merge pull request #4324 from eed3si9n/wip/bumpvscodemodules
sbt 1.2.1 and some maintenance npm bumps
2018-08-16 23:38:25 -04:00
Eugene Yokota 494f384c49 Formatting 2018-08-16 16:36:41 -04:00
Eugene Yokota 42a4ae33f5 Merge branch 'wip/bumpvscodemodules' into wip/merge-1.2.x 2018-08-16 16:26:26 -04:00
eugene yokota 05cecc378c
Merge pull request #173 from smarter/position-range
xsbti.Position: add startOffset and endOffset
2018-08-16 16:25:11 -04:00
Eugene Yokota 590dc5e96d Merge branch '1.2.x' into wip/merge-1.2.x 2018-08-16 16:15:15 -04:00
eugene yokota f8beb5fcce
Merge pull request #4323 from jastice/dont-warn-version-override
don't warn when current sbt version doesn't match version in build.properties
2018-08-16 16:05:17 -04:00
Eugene Yokota fa3b0f0313 sbt 1.2.1 2018-08-16 15:55:25 -04:00
Eugene Yokota 349f56fed5 Bump modules to address security vulnerability 2018-08-16 15:54:40 -04:00
Justin Kaeser a50e351c58 don't warn when current sbt version doesn't match version in build.properties when version is set by system property.
mitigates https://github.com/sbt/sbt/issues/4303
2018-08-16 18:01:54 +03:00
eugene yokota bb8bd7b0ca
Merge pull request #4308 from seratch/fix-typos
Fix the several typos detected by github.com/client9/misspell
2018-08-15 10:51:03 -04:00
Arnout Engelen bed2e11d59 Update test to reflect new WindowsDiscoverConfig ctor 2018-08-15 16:19:14 +02:00
Arnout Engelen b699f0fc6f Also look in (x86) 2018-08-15 11:21:30 +02:00
eugene yokota 74f5cdc630
Merge pull request #4300 from Philippus/default-maven-configs
Set default maven configurations in pom configuration, fixes #1380
2018-08-14 15:56:45 -04:00
Philippus 1c5fd5bece
Add Custom scope to pom configuration 2018-08-13 22:37:55 +02:00
Guillaume Martres 5e3a102606 xsbti.Position: Also add {start,end}{Line,Column}
Positions in the Language Server Protocol and Build Server Protocol are
line/column-based instead of offset-based, so this is more convenient.
Computing the line/column from the offset is possible but requires
reading the source file.
2018-08-14 02:04:55 +09:00
Guillaume Martres 78834527df xsbti.Position: add startOffset and endOffset
A position now has a start, an end, and a point (the existing `offset`),
just like it does in the Scala compiler. This information is especially
useful for displaying squiggly lines in an IDE.

This commit and the next one are required for https://github.com/sbt/zinc/pull/571
2018-08-14 02:04:43 +09:00
Guillaume Martres f457696a99 Upgrade to sbt 1.2.1 2018-08-13 01:03:08 +09:00
Arnout Engelen b1fc7dc183 Support discovering JDK 11 in JAVA_HOME for CrossJava 2018-08-09 14:43:11 +02:00
Kazuhiro Sera 4a04764f20 Fix the several typos detected by github.com/client9/misspell 2018-08-08 16:34:45 +09:00
Kazuhiro Sera 59dbc0645e Fix the several typos detected by github.com/client9/misspell 2018-08-08 15:57:34 +09:00
Julien Sirocchi bb49018c52 Fixes #4236 2018-08-07 10:26:56 +01:00
eugene yokota 549c69463d
Merge pull request #4304 from eed3si9n/wip/bump
Zinc 1.2.1, IO 1.2.1
2018-08-06 18:52:29 -04:00