Overview

• Branch : wip_exp_backport
• Maintenair : David Bernard
• Goals : provide a running cocktail version of other branch :
  • backport of wip_experiment branch for released versions of scala (currently 2.8.1, and 2.9.0 when it'll be released)
  • Google Summer of Code ( + some changes (preferences, a shortcut (button + keyboard) to switch display of implicits quicker, ...)
  • changesets done on master (mainly by Mirko) since the original branching
  • some fixes and enhancement (I hope) :
    • provide several tuning preferences to help user / developper to test configuration at runtime (diseable some features, ...).
    • about information (to know the version (last changeset + branch))
    • use Defensive to reduce impact of exception, wrong value,...
    • reducing of freeze (try to move some computation in Job and out of "main" thread, useless creation/access to ScalaPresentationCompiler, ...)
    • ...
• Update-site (for Galileo and Helios) :
  • staging : http://download.scala-ide.org/update-1.0.0-milestones-2.8.1.final
  • nightly (wip) : http://download.scala-ide.org/nightly-update-wip-exp-backport-2.8.1.final
  • archive of update-site (nightly) : http://download.scala-ide.org/builds/nightly-wip-exp-backport-2.8.1.final/
• CI : http://hudson.scala-ide.org/job/scala-ide-nightly-wip-exp-backport-2.8.1.final/

Building

for scala 2.8.1

wip_exp_backport use a custom toolchain whitout scala.tools.nsc.interactive package, because this package is backported from scalac-trunk (2.9). so to build you need to build a custom toolchain (once)

cd org.scala-ide.build-toolchain
./build-toolchain-2.8.1.final.sh
cd ..

when done you build wip_exp_backport with

cd org.scala-ide.build
./build-ide-local-2.8.1.final.sh

for scala 2.9.0-SNAPSHOT

(no need to build a custom toolchain)

cd org.scala-ide.build
./build-ide-trunk.sh

TODO

• keep sync with wip_experiment, master
• -- reintroduce TopLevelMap-- need for 2.8.x but deprecated for 2.9.x, so try to enable it as "optional/contextual"
• replace println by Tracer call
• complete port to Helios (management of AJDT version)

Synchronization with wip_experiment

2011-01-24

Done by merge + lot of conflit revision:ea0edba688

2010-12-23

Done by merge

2010-11-27

Done by merge :

git checkout wip_experiment
git pull origin wip_experiment
git checkout wip_exp_backport
git merge wip_experiment

Synchronization with master

next synchronisation command to list change to cherry-pick

git log -u master..42d40b919ba916d798bc9c482a49b16db3f73507

2010-11-27

Status of changes (cherry-picked) from git shortlog wip_exp_backport..master

David Bernard (11):
-     try to fix #1000164 ClassCastException into ScalaMatcherLocator
-     add naive support of OrPattern
-     add support of OrPattern in ScalaMatchLocator(cherry picked from commit 7b5236f538d40a1d6f82bfb4d3fc0226117e7dc2)
+     avoid NPE if this member is not declared in a compilation unit (for example, a binary type) (see javadoc of getCompilationUnit)
!     micro-optimization : avoid temp object on TopLevelMap initialization
!     replace 'println' by Tracer.println to print more information
!     CRLF     replace println by Tracer.println
~     adapt patch from Matthew Farwell     Fix #2785 ArrayIndexOutOfBoundsException in ASTConverter.isPrimitiveType
!     remove println
+     Fix #1000193 reduce time computation (clean+build)

Matt Russell (1):
+     Have ScalaDocumentPartitioner implement the "preferOpenPartitions" contract of IDocumentPartitionerExtension2 (closes #1000128)

Matthew Farwell (1):
+     test #1000023 Scala launch: Does not follow JDT behaviour

Miles Sabin (8):
+     Point the backwards compatible classpath container initializer at an instantiatable class.
-     Attempted fix of #1000160 by constructing the source file earlier, avoiding the nested lock.
-     Fixed a regression introduced in revision:645367eb5304b164164d3be76abf67eb0b75a574. The presentation compiler was never getting to see updated source.
-     Updates to support building relative to 2.8.0.RC1.
-     Bumped RC1 => RC2; Added support for building against 2.8.1.final.
-     Deduplicated profile id.
~     Added support for building relative to 2.8.1.final.

Mirko Stocker (1):
-     Fixes #1000146 bad position in java source compare when using subversive

eugene.vigdorchik (2):
+     JMethodType with JType.UNKNOWN is encoded to JType.UNKNOWN
+     Some performance optimizations for typing (visible on large files only)

Legende :

• ~ need manual conflict resolution
• - ignored, mainly because wip_experiment contains rewrited/deleted resources (eg : ScalaCompletionEngine, ScalaMatchLocator, ScalaPresentationCompiler, ScalaCompilationUnit.scala)
• + cherry-pick successfull (no manual action), or already present/applied
• ! not done, need to create a specific change