Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jun 7, 2012
  1. Luc Bourlier

    Clean up and simplification of the poms

    skyluc authored
    Made the dependencies of library, compiler and sbt optional, so they don't have to be excluded later.
    Moved the 'allowConflictingDependencies' option to the projects which require it (feature and site).
    It is needed because of the mix of versions for the elements coming from the m2 repo.
    Removed the dependency to aspectjrt (not needed)
    Cleaned-up an invalid property definition in sbt.full.library.
    Created properties for all plugin version numbers
    Fixed typo
    Fixed git location
    Added parameter to the p2 repositories ids
Commits on Jun 5, 2012
  1. Luc Bourlier

    Major refactoring of the maven build.

    skyluc authored
    No bash script needed anymore. Everything is managed through maven.
    The new pom at in root folder contains version information and general configuration.
    org.scala-ide.build-toolchain is the root of the toolchain part
    org.scala-ide.sbt.build is the root of the sdt part
    The version numbers of some plugins has been upgraded
    
    The downloaded libs have been moved to the target/lib folders, to simplify the clean up process.
    
    The first time, run './build-all.sh (or './build-all.sh install -P scala-2.10.x' for 2.10) from the root to generate an initial build and install the top pom locally. Then use maven from any project or subproject.
    
    Use the scala-2.10.x profile ('-P scala-2.10.x') to compile the 2.10 version.
    
    Re #1001056
Commits on Mar 23, 2012
  1. Mirco Dotta

    Heavy cleanup of pom files and scripts.

    dotta authored
    * Using ${osgi.version.number} when creating the MANIFEST of both scala-compiler and scala-library jars.
    
    * Created a parent pom project that contains definitions common to all projects.
    
    * Cleaned up pom files (removed useless profiles from both ``build`` and ``build-toolcahin`` projects)
    
    * Deleted no longer needed build scripts.
Commits on Mar 5, 2012
  1. Mirco Dotta

    Open Declaration via the context menu now works as expected.

    dotta authored
    When the user right clicks on a element and select "Open Declaration" in the
    context menu, an instance of ``OpenAction`` is used to resolve the binding and
    jump to the declaration.
    
    Because the Eclipse API does not expose an extension point for this action, I
    had to create a custom extension point (using AJDT), which allows weaving in to
    JDT and can be used to intercept the creation of ``OpenAction``, if it
    originates from a Scala editor.
    
    This seem to be the only solution, which does not involve creating our own
    Scala Editor. Hopefully, we will be able to remove this custom extension point
    once we implement the Scala Editor (this is planned for Milestone 2 of the
    Scala IDE Helium).  Using AJDT for customizing the behavior of ``OpenAction``
    was also suggested by Andrew Eisenberg in the following StackOverflow question:
    
    	http://stackoverflow.com/questions/1882053/how-can-i-define-a-custom-action-for-open-declaration-shortcut-f3-in-eclipse
    
    Fix #1000920.
Commits on Jan 18, 2012
  1. JHeiner
  2. Mirco Dotta

    Merged branch platform/indigo-3.7 back in master (all changes have been

    dotta authored
    squashed in a single commit). Thanks a lot Eric for your great work.
    
    Here follows the list of changes applied in this commit:
    
    - Created a repo.ajdt entry and use 2.1.3 for JDT 3.7 (we could also use AJDT
      2.2 snapshot, but I still think it's better to use the currently released
      AJDT and move to 2.2 only after it is officially released).
    
    - Use Eclipse Indigo release site (this fixes JDK 7 builds).
    
    - Pass isMember correctly derived if the owner is a class.  Obtain jdtFlags
      using ScalaJavaMapper.mapModifiers(symbol)
    
    - Add flags and methodParameter to ScalaLocalVariableElement.
    
    Re #1000852.
Commits on Dec 12, 2011
  1. Mirco Dotta

    Added 'org.eclipse.jdt.groovy.core' in Eclipse-SupplementBundle secti…

    dotta authored
    …on of
    
    MANIFEST. Fix #1000798
    
    To correct #3135 we removed the AJDT dependency from the Scala IDE. An
    undesired side-effect of this change was that the Scala IDE was no longer
    usable if the Groovy IDE was also installed.
    The problem was that our (aspect) class responsible of intercepting the call to
    create a ScalaSourceFile was no longer used, that because our class was
    targeting the 'org.eclipse.jdt.core' bundle, which is not loaded when the
    Groovy IDE is installed.
    The fix was to edit the MANIFEST's Eclipse-SupplementBundle section of our
    'org.scala-ide.sdt.aspects' project, and make sure that our aspect class is
    called also when the call is performed from the 'org.eclipse.jdt.groovy.core'
    bundle (which is the Groovy IDE core bundle). The AJDT plugin does exactly
    that, and that is why this problem was a side-effect of removing the AJDT
    dependency from the Scala IDE.
    
    (no review)
    
    cherry-picked from 3b477dd
Commits on Dec 8, 2011
  1. Luc Bourlier

    Added more comments, cleaned up ScalaJavaDepTest

    skyluc authored
    Removed unnecessary logging
    (cherry picked from commit 2dfffd3)
  2. Luc Bourlier

    Added check for nested projects.

    skyluc authored
    Projects, like the one imported from multi-modules maven project
    can be nested. It this case a file can be represented by multiple
    resources. Select only the one for the current project.
    (cherry picked from commit ee80588)
  3. Luc Bourlier

    Improved support for dependent projects.

    skyluc authored
    Made sure that the java files flagged to be compiled by sbt are actually
    compiled, even if they are part of dependent project without change.
    (cherry picked from commit 9dcc742)
  4. Luc Bourlier

    Renamed custom source delta and added doc.

    Luc Bourlier authored skyluc committed
    (cherry picked from commit a7a076a)
  5. Luc Bourlier

    Re #1000388. @Override rules are not the same in Java 1.5 and 1.6. Fi…

    Luc Bourlier authored skyluc committed
    …xing it so it compiles fine in the command line.
    
    (cherry picked from commit 3d6f7d2)
  6. Luc Bourlier

    One step closer. Eclipse compiler to follow sbt requests.

    skyluc authored
    Added code to update on the fly the delta used by the Eclipse Java compiler, so it compiles
    the file requested by sbt.
    
    It works fine for RE #1000607 on my system.
    For RE #1000388, it is only part of the solution. It mostly works but sometimes sbt doesn't request the recompilation of the
    dependent Java class.
    (cherry picked from commit fbfffa2)
Commits on Dec 7, 2011
  1. Iulian Dragos
Commits on Dec 6, 2011
  1. Iulian Dragos

    Removed the AJDT weaving dependency so that we are more

    dragos authored
    compatible with Spring IDE and AJDT.
    
    Copied the corresponding code from the AJDT plugin
    to our aspects code. Kept the same two extension points.
    
    Changed the update site to show only the Scala IDE
    feature (binary and source). The weaving feature is
    a nested feature in the SDT feature, because it needs its
    own license.
    
    Added LICENSE files. The Scala license for the project,
    and the EPL for the org.scala-ide.sdt.aspects bundle.
    
    Fixed #1000780.
Commits on Nov 10, 2011
  1. Iulian Dragos

    Don't read classfile bytes if the classfile is not part of a Scala pr…

    dragos authored
    …oject. This may cause large delays when the class files are on a network mounted file system.
    
    Fixed #1000742, Fixed #1000233, Fixed #1000643.
Commits on Oct 28, 2011
  1. Iulian Dragos

    Merge branch 'release/scala-ide-2.0.x'

    dragos authored
    Conflicts:
    	README.md
Commits on Oct 27, 2011
  1. Iulian Dragos

    Initial commit for Find references. Fixed already existing code. Basi…

    dragos authored
    …c search works,
    
    but only through the Java Search window (no right-click support). Method definitions and references are not distinguished, probably still some bugs that need ironing out. In the medium term we need to revamp ScalaMatchLocator.
    
    Refs #1000698.
Commits on Oct 20, 2011
  1. Mirco Dotta
  2. Mirco Dotta

    Test suggested by Iulian in its code review (look at the test t100067…

    dotta authored
    …0_1) was indeed a source of new issues. The problem is that JDT internal may use different program's path to check for deferred methods when there are more than one method with the same signature defined in the type hierarchy. To correctly handle this case I had to weave in MethodVerifier and hook into 'checkAbstractMethod'. Hopefully, this should cover all the cases, but since I'm not entirely convinced I plan to write more tests before actually merging this back into the mainline.
    
    While working on it, I have done some major refactoring of the testing class, which should now be easier to read and has far less duplicate code.
  3. Mirco Dotta

    Fixed #1000670 (Missing implementation of a deferred method is not re…

    dotta authored
    …ported in the Java editor). The ScalaMethodVerifierProvider was too aggressive. Specifically, when looking for the method that matches the signature of the provided 'abstractMethod', if no method symbol can be located in the trai method's owenr, the JDT MethodVerifier should be run (or potential errors can be swallowed, as it was the case).
Commits on Sep 29, 2011
  1. Iulian Dragos
Commits on Sep 21, 2011
  1. Luc Bourlier
Commits on Sep 15, 2011
  1. Mirco Dotta

    Fixed #1000594. Non-deferred methods of a trait should not produce er…

    dotta authored
    …rors in Java classes that inherit the non-deferred trait members from a Scala abstract class.
Commits on Aug 29, 2011
  1. Eric Molitor Iulian Dragos

    Merge Tycho 0.12.0 and remove old tycho work around

    emolitor authored dragos committed
    Conflicts:
    
    	org.scala-ide.build/pom.xml
Commits on Aug 28, 2011
  1. Matt Russell
Commits on Jul 20, 2011
  1. Mirco Dotta

    removed comment

    dotta authored
  2. Mirco Dotta

    Fixed #1000494. Problem was the Java editor was getting opened instea…

    dotta authored
    …d of the Scala one, and hence it was not possible to set brakpoints. Using JDT aspect weaver to incercept the call to the EditorId string I was able to force Eclipse into using the Scala Editor.
Commits on Jun 22, 2011
  1. Iulian Dragos

    Support Indigo. The only necessary change was the way the JavaBuilder…

    dragos authored
    … is invoked by the Scala builder class. In 3.6 (Helios), it's by calling InternalBuilder.setProject (reflectively because it's a private method). In 3.7 (Indigo), builders use BuildConfigurations, which hold the project.
Commits on Apr 27, 2011
  1. Matt Russell Donna Malayeri

    Bug fix for format save action not respecting "format source code" pr…

    mdr authored lindydonna committed
    …eference
Commits on Mar 28, 2011
  1. Iulian Dragos

    Updated build scripts to use scala-compiler/library 2.10-SNAPSHOT, ad…

    dragos authored
    …ded build scripts for 2.9.x and bumped major version number to 2.0.0 to differentiate vs. backport.
Commits on Mar 15, 2011
  1. Eugene Vigdorchik
Commits on Mar 11, 2011
  1. Eugene Vigdorchik

    Revert "Remove obsolete pointcut."

    vigdorchik authored
    This reverts commit 747fdc3.
Commits on Mar 7, 2011
  1. Eugene Vigdorchik
Commits on Feb 28, 2011
  1. Eugene Vigdorchik
Something went wrong with that request. Please try again.