summaryrefslogtreecommitdiff
path: root/src/eclipse
Commit message (Collapse)AuthorAgeFilesLines
* adjust to partest 1.1.0's new mixed Java/Scala compilationLukas Rytz2017-01-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | upgrades partest from 1.0.17 to 1.1.0 https://github.com/scala/scala-partest/pull/69 changed the mode for mixed compilation, which used to be 1. scalac *.java *.scala -d o 2. javac *.java -d o -cp o 3. scalac *.scala -d o -cp o Now the third step is skipped. This required some adjustments to existing tests. - t7014 is split in two groups, the fix is for separate compilation. - t7582 is also split. It tests inliner warnings when inling code that accesses Java-defined package-private code. Inlining from Java only works in separate compilation (no bytecode available in mixed compilation). - Java compiler warnings of "run" tests were not reported in the old scheme, now they are. Deprecation / unchecked warnings were removed from t6240, t8786, varargs. - t4788 required a .check file update to pass, which hints at a bug. I will re-open SI-4788 and investigate later.
* assorted typo fixes, cleanup, updating of commentsSeth Tisue2016-10-241-2/+2
| | | | | | just in time for Halloween. "boostrap" is definitely the most adorable typo evah -- and one of the most common, too. but we don't want to scare anybody.
* SI-9560 Remove dependency on parser-combinators/jsonSimon Ochsenreither2016-07-226-11/+10
| | | | | | | Also update a few example IDE files for Eclipse and IntelliJ. This drops the dependency by integrating the bare minimum functionality to keep things working.
* SI-9522 release key reference when deleting from OpenHashMapPerformant Data LLC2016-05-242-1/+2
| | | | | | | | | This sets the key field in the hash table entry to its default value when an entry is deleted, so as not to unexpectedly retain an object reference, leading to a memory leak. Also includes incidental changes to the slot location algorithm that reduce the number of deleted entries.
* Bump to scala-partest 1.0.14Jason Zaugg2016-05-122-2/+2
| | | | | This should fix the bootstrap build by incorporating https://github.com/scala/scala-partest/pull/58
* Fix the Eclipse classpaths for 2.12.0-M4. (#5136)Performant Data2016-04-283-5/+5
|
* Merge commit '23159d2' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-229-29/+103
|\
| * Automate Eclipse settings and update project files: (#5091)Iulian Dragos2016-04-209-27/+101
| | | | | | | | | | | | | | | | - remove `M2_REPO`. All dependencies are picked up from `build/deps` - add script to update an existing workspace directory with the required path variables - add the default Scala library to several projects for better out-of-the-box experience. This means that changes in the scale-library project may not be visible in the other projects, but makes it way easier to get a working config. If you really need that, you probably know what you’re doing anyway.
* | Merge commit '8eb1d4c' into merge-2.11-to-2.12-nov-24Lukas Rytz2015-11-241-3/+8
|\|
| * Merge pull request #4792 from SethTisue/round-of-readme-updatesLukas Rytz2015-10-161-6/+11
| |\ | | | | | | misc upgrades to README
| | * more readme improvementsSeth Tisue2015-10-081-6/+11
| | | | | | | | | | | | | | | | | | * be clearer about required JDK versions * eliminate redundancy with existing src/eclipse and src/intellij readmes * give IntelliJ readme a .md extension
* | | merge 2.11.x onto 2.12.x, Oct 16 2015Seth Tisue2015-10-169-0/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there were merge conflicts in the Eclipse config that I resolved with --ours. I invite @performantdata to submit a followup PR bringing the Eclipse stuff into a good state on 2.12.x. there was a test failure in test/junit/scala/collection/mutable/OpenHashMapTest.scala due to the 2.12 compiler emitting the field backing a private var differently (with an unmangled name). Lukas says the difference is expected, so I just updated the code in the test. there were no other merge conflicts. % git log --decorate --oneline -1 origin/2.11.x | cat ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request #4791 from performantdata/issue/9508 % git log --decorate --oneline -1 origin/2.12.x | cat c99e53e (HEAD -> 2.12.x, origin/2.12.x) Merge pull request #4797 from lrytz/M3-versions % export MB=$(git merge-base 2.12.x origin/2.11.x) % echo $MB 42cafa21f3c4a08c6dd34608278f810b6ec2886f % git log --graph --oneline --decorate $MB...origin/2.11.x | cat * ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request #4791 from performantdata/issue/9508 |\ | * 08dca37 (origin/pull/4791) SI-9508 fix classpaths in Eclipse configuration * | fe76232 Merge pull request #4798 from performantdata/issue/9513 |\ \ | * | 9c97a7f (origin/pull/4798) Suppress unneeded import. | * | 30d704d Document some OpenHashMap internal methods. | * | 1fb32fc SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reused | |/ * | 14f875c Merge pull request #4788 from dk14/patch-1 |\ \ | * | 42acd55 (origin/pull/4788) explicitly specify insertion-order feature in docs | / * | 68ce049 Merge pull request #4771 from som-snytt/issue/9492-here |\ \ | * | f290962 (origin/pull/4771) SI-9492 Line trimming paste | * | bc3589d SI-9492 REPL paste here doc | / * | 9834fc8 Merge pull request #4610 from todesking/spec-implicits-remove-obsolete |\ \ | * | 46009b1 (origin/pull/4610) Add view/context-bound parameter ordering rule | * | 6eba305 Spec: Implicit parameters with context/view bound is allowed since 2.10 | / * | d792e35 Merge pull request #4789 from janekdb/2.11.x-param-names-predicates-operations |\ \ | |/ |/| | * b19a07e (origin/pull/4789) Rename forall, exists and find predicate and operator params. |/ * 648c7a1 Merge pull request #4790 from SethTisue/issue/9501 |\ | * 40d12f1 (origin/pull/4790) SI-9501 link README to Scala Hacker Guide * e0b5891 Merge pull request #4786 from performantdata/issue/9506 * 39acad8 (origin/pull/4786) SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs * 74dc364 SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs % git merge ae5f0de Auto-merging src/repl/scala/tools/nsc/interpreter/ILoop.scala Auto-merging src/library/scala/util/Either.scala Auto-merging src/library/scala/runtime/Tuple3Zipped.scala Auto-merging src/library/scala/runtime/Tuple2Zipped.scala Auto-merging src/library/scala/collection/parallel/ParIterableLike.scala Auto-merging src/library/scala/collection/immutable/ListMap.scala Auto-merging src/library/scala/collection/TraversableLike.scala Auto-merging src/eclipse/test-junit/.classpath CONFLICT (content): Merge conflict in src/eclipse/test-junit/.classpath Auto-merging src/eclipse/scaladoc/.classpath CONFLICT (content): Merge conflict in src/eclipse/scaladoc/.classpath Auto-merging src/eclipse/scala-compiler/.classpath Auto-merging src/eclipse/repl/.classpath CONFLICT (content): Merge conflict in src/eclipse/repl/.classpath Auto-merging src/eclipse/partest/.classpath CONFLICT (content): Merge conflict in src/eclipse/partest/.classpath Auto-merging src/eclipse/interactive/.classpath Auto-merging README.md Automatic merge failed; fix conflicts and then commit the result. % git checkout --ours src/eclipse/partest/.classpath % git checkout --ours src/eclipse/repl/.classpath % git checkout --ours src/eclipse/scaladoc/.classpath % git checkout --ours src/eclipse/test-junit/.classpath % git add -u % emacs test/junit/scala/collection/mutable/OpenHashMapTest.scala % git diff test/junit/scala/collection/mutable/OpenHashMapTest.scala | cat ... - val field = m.getClass.getDeclaredField("scala$collection$mutable$OpenHashMap$$deleted") + val field = m.getClass.getDeclaredField("deleted") ... % git add -u
| * | SI-9508 fix classpaths in Eclipse configurationPerformant Data LLC2015-10-128-47/+17
| | |
| * | SI-9506 suppress Scala IDE-generated files in the Eclipse project dirsPerformant Data LLC2015-10-062-0/+4
| | |
| * | SI-9506 suppress Scala IDE-generated files in the Eclipse project dirsPerformant Data LLC2015-10-057-0/+14
| |/
| * SI-9502 Update Eclipse classpaths for scaladoc project.Michael2015-10-021-3/+3
| |
| * use latest partest (1.0.9)Seth Tisue2015-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | the new version should be no different, from this repo's perspective, since the changes made between 1.0.7 and 1.0.9 had only to do with build and packaging. nonetheless, we should be using the latest latest to help guard against regressions. (my other motive is that I'm contemplating fixing a partest issue that would result in a 1.0.10 release, so I'd like to have the upgrade to 1.0.9 in place first, so if anything goes wrong there is less searching to do for the cause)
* | Update README for Eclipse setupSimon Schäfer2015-09-161-3/+10
| |
* | Update Eclipse build filesSimon Schäfer2015-09-169-49/+21
| | | | | | | | This updates the Eclipse build files to the latest state of the arts.
* | Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2015-07-134-6/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | merge/2.11.x-to-2.12.x-20150713 Conflicts: src/eclipse/partest/.classpath src/eclipse/repl/.classpath test/files/run/nothingTypeNoFramesNoDce.scala test/files/run/repl-javap-app.check Also fixup two .classpath files with updated partest, xml and parser combinators JARs.
| * Update Eclipse classpath entriesTim Vergenz2015-07-043-3/+3
| |
* | Merge commit 'fcc20fe' into merge/2.11-to-2.12-apr-1Lukas Rytz2015-04-011-21/+2
|\|
| * IDE setup sectionAdriaan Moors2015-02-061-21/+2
| |
* | Bump versions for Eclipse .classpath.François Garillot2014-09-093-5/+4
|/ | | | Remove cruft in repl.
* repl depends on jline-2.12Adriaan Moors2014-07-181-2/+2
|
* Eclipse project: repl depends on compiler/lib projectsAdriaan Moors2014-07-171-8/+8
|
* Make partest to depend on Scala compiler Eclipse project.Grzegorz Kossakowski2014-05-071-3/+3
| | | | | This way changes made to Scala compiler sources are visible to partest in Eclipse.
* Fix partest-extras eclipse project dependenciesAdriaan Moors2014-02-051-1/+1
|
* Add repl as dependency of test-junit Eclipse project.Grzegorz Kossakowski2014-02-061-0/+1
| | | | | Since 8f20fa23dbb5b000f0889132b8c6e2acfff096b3 junit tests depend on repl. We need to reflect that dependency in our Eclipse project files.
* Modularize continuations plugin.Adriaan Moors2013-12-136-43/+0
| | | | | The continuations plugin and library will still ship with 2.11 (albeit unsupported). They now reside at https://github.com/scala/scala-continuations.
* Update Eclipse classpath filesSimon Schaefer2013-11-232-4/+4
|
* Added information on how to launch and debug scalac inside EclipseMirco Dotta2013-11-151-1/+6
|
* Updated Eclipse .classpath for partest and scaladoc projectsMirco Dotta2013-11-142-4/+4
|
* Updated instructions for setting up Eclipse for Scala developmentMirco Dotta2013-11-071-0/+11
|
* Updated Eclipse .classpath of partest and scaladoc projectsMirco Dotta2013-11-072-4/+4
| | | | | | | The version of some of the dependencies used in partest and scaladoc projects did not match the version defined in `version.properties`. This prevented the above projects from compiling correctly because the old dependencies were not available in the local maven repository.
* Correct build command for scala-ideSimon Schaefer2013-10-031-1/+1
|
* Update of Eclipse project filesSimon Schaefer2013-09-229-112/+57
| | | | | | | - Update of project dependencies - Deletion of scala-xml project - Deletion of scala-parser-combinators project - Update of .gitignore to match nested .cache files
* Update scaladoc's .classpath to new name of partest projectFrançois Garillot2013-09-091-1/+1
| | | | | (see github.com/scala/scala-partest ) review by @dragos
* Move partest to https://github.com/scala/scala-partestAdriaan Moors2013-08-202-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As partest is now resolved from maven, `test/partest` uses `ant test.suite.init` to determine the classpath (serialized to build/pack/partest.properties) that's necessary to run `scala.tools.partest.nest.ConsoleRunner`. Thus, partest gets exactly the same classpath, whether run from the command line through `test/partest` or via `ant test`. The version of partest we're using is specified by properties defined in versions.properties (formerly `starr.number`). Currently, we're using: ``` scala.binary.version=2.11.0-M4 partest.version.number=1.0-RC3 ``` NOTES: - The version of Scala being tested must be backwards binary compatible with the version of Scala that was used to compile partest. - Once 2.11 goes final, `scala.binary.version=2.11`, and `starr.version=2.11.0`. - Need scalacheck on classpath for test/partest scalacheck tests. - Removed atrophied ant tests (haven't been run/changed for at least two years I checked 81d659141a as a "random" sample). - Removed scalacheck. It's resolved as a partest dependency. - For now, use a locally built scalap - Kept the trace macro in the main repo (partest-extras) - New targets for faster pr validation: test-core-opt, test-stab-opt - Reused partest eclipse/intellij project to partest-extras (note: the partest dependency is hard-coded)
* Address TODOs around SymbolLoaders and SymbolTable.Grzegorz Kossakowski2013-07-302-4/+6
| | | | | | | | | | | | | | | | | | | | | | SymbolTable refactoring introduced some TODOs that were supposed to be addressed after M5 release. The reason I couldn't address those problems right away was a conflict with our plans to modularize Scaladoc and interactive. However, we decided to delay that work until after M5 is released so addressing TODOs is not blocked anymore. This commit introduces the following changes: * Eclipse project definitions for interactive and scaladoc depend on scala-compiler project so they are builded against latest version of the compiler (quick) instead of STARR. This aligns our Eclipse project definitions with build.xml structure. * Introduce GlobalSymbolLoaders class which wires dependencies of SymbolLoaders with assumption of dependency on Global. * Switch to GlobalSymbolLoaders in BrowsingLoaders, interactive Global and ScaladocGlobal; this eliminates all TODO comments introduced before
* The `test-junit` Eclipse project depends on `scala-compiler`Grzegorz Kossakowski2013-07-272-4/+5
| | | | | | | | | | | We want to write JUnit tests for Scala compiler so we should depend on `scala-compiler` project in `test-junit`. Also, make dependencies of `scala-compiler` project exported so it's enough to depend on `scala-compiler` to get all the transitive dependencies that are needed by the compiler. Otherwise, one would need to copy all dependencies of Scala compiler to all Eclipse projects that depend on the compiler.
* Updated eclipse project files.Adriaan Moors2013-07-0516-75/+138
| | | | | | | | Set everything up so that soon-to-be independent modules are compiled with the Eclipse plugin's compiler & library (2.11.0-M3 currently). Most projects still compile with 2.11.0-M3, but partest will need a nightly build of 2.11.
* Merge remote-tracking branch 'scala-2.10.x/junit' into masterGrzegorz Kossakowski2013-06-163-0/+50
|\
| * Add Eclipse project for JUnit tests.Grzegorz Kossakowski2013-06-153-0/+50
| |
* | update eclipse projects (partest, repl & scaladoc)Adriaan Moors2013-03-124-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we've removed scala.annotations.serializable in 2.11, you'll need to following bandaid to use eclipse on master. This is the easiest fix, but certainly not recommended in general. ``` --- i/src/eclipse/scala-library/.classpath +++ w/src/eclipse/scala-library/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="library"/> - <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> + <classpathentry exported="true" kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/> ``` This corresponds to checking the export check box for the scala library jar in the library's build path.
* | Add eclipse projects for interactive, scaladoc.Jason Zaugg2013-03-104-0/+89
| |
* | Updated copyright to 2013Carlo Dapor2013-01-021-1/+1
| |
* | Merge branch 'merge-wip-into-2.10.x' into merge-2.10-into-masterPaul Phillips2012-12-117-0/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge-wip-into-2.10.x: (44 commits) Cleanups of reifyBoundTerm and reifyBoundType SI-5841 reification of renamed imports Share the empty LinkedList between first0/last0. SI-4922 Show default in Scaladoc for generic methods. SI-6614 Test case for fixed ArrayStack misconduct. SI-6690 Release reference to last dequeued element. SI-5789 Use the ReplTest framework in the test SI-5789 Checks in the right version of the test SI-5789 Removes assertion about implclass flag in Mixin.scala SI-6766 Makes the -Pcontinuations:enable flag a project specific preference more ListOfNil => Nil DummyTree => CannotHaveAttrs evicts assert(false) from the compiler introduces global.pendingSuperCall refactors handling of parent types unifies approaches to call analysis in TreeInfo TypeApply + Select and their type-level twins SI-6696 removes "helper" tree factory methods SI-6766 Create a continuations project in eclipse Now the test suite runs MIMA for compatibility testing. ... Conflicts: src/compiler/scala/reflect/reify/codegen/GenUtils.scala src/compiler/scala/tools/nsc/ast/Trees.scala src/compiler/scala/tools/nsc/backend/icode/GenICode.scala src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala src/compiler/scala/tools/nsc/typechecker/Contexts.scala src/compiler/scala/tools/nsc/typechecker/Namers.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/eclipse/scala-compiler/.classpath src/eclipse/scalap/.classpath src/reflect/scala/reflect/internal/StdNames.scala src/reflect/scala/reflect/internal/TreeInfo.scala
| * SI-6766 Makes the -Pcontinuations:enable flag a project specific preferenceJames Iry2012-12-062-4/+4
| | | | | | | | | | | | | | | | | | | | | | Make the continuations plugin flag specific to the continuations library. Remove the documentation about adding the continuation plugin from the eclipse README.md. One consequence of this change is that if a programmer has prefs for the continuations eclipse project then there will be a merge conflict. That's unavoidable without having a more sophisticated way to build the eclipse projects.
| * SI-6766 Create a continuations project in eclipseJames Iry2012-12-067-2/+46
| | | | | | | | | | | | | | | | | | We're missing a continuations dependency when we try to build reflect in eclipse which causes things to die horribly. This commit adds an eclipse project for the library portion of continuations, makes projects that depend on the scala-library also depend on continuations-library, and adds another bullet to the eclipse readme to turn on the continuations plugin.
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-16 13:53:51 +0000