Browse files

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

  • Loading branch information...
2 parents 533ae1f + 3a97f5e commit 1d5cba91779a56bd2cbfb26c848404345a586a46 @dotta dotta committed Oct 1, 2011
View
2 org.scala-ide.build/build-ide-2.8.2-SNAPSHOT → org.scala-ide.build/build-ide-2.8.3-SNAPSHOT
@@ -2,6 +2,6 @@
. $(dirname $0)/env.sh
-SCALA_VERSION=2.8.2-SNAPSHOT
+SCALA_VERSION=2.8.3-SNAPSHOT
build $*
View
32 org.scala-ide.build/pom.xml
@@ -252,6 +252,38 @@
</repositories>
</profile>
<profile>
+ <id>scala-2.8.3-SNAPSHOT</id>
+ <activation>
+ <property>
+ <name>scala.version</name>
+ <value>2.8.3-SNAPSHOT</value>
+ </property>
+ </activation>
+ <properties>
+ <version.suffix>2_08</version.suffix>
+ </properties>
+ <repositories>
+ <repository>
+ <id>scala-refactoring-trunk</id>
+ <name>Scala Refactoring Scala 2.8.3-SNAPSHOT p2 repository</name>
+ <layout>p2</layout>
+ <url>${repo.scala-ide}/scala-refactoring-2.8.3-SNAPSHOT</url>
+ </repository>
+ <repository>
+ <id>scalariform-trunk</id>
+ <name>Scalariform Scala 2.8.3-SNAPSHOT p2 repo</name>
+ <layout>p2</layout>
+ <url>${repo.scala-ide}/scalariform-2.8.3-SNAPSHOT</url>
+ </repository>
+ <repository>
+ <id>scala-toolchain-2.8.3-SNAPSHOT</id>
+ <name>Scala Toolchain 2.8.3-SNAPSHOT p2 repository</name>
+ <layout>p2</layout>
+ <url>${repo.scala-ide}/scala-eclipse-toolchain-osgi-2.8.3-SNAPSHOT</url>
+ </repository>
+ </repositories>
+ </profile>
+ <profile>
<id>scala-2.9.0</id>
<activation>
<property>
View
17 org.scala-ide.sdt.core/src/scala/tools/eclipse/javaelements/ScalaStructureBuilder.scala
@@ -237,12 +237,17 @@ trait ScalaStructureBuilder extends ScalaAnnotationHelper { pc : ScalaPresentati
tpElementInfo.bounds = tp.bounds
- val start = tpSymbol.pos.startOrPoint
- val end = tpSymbol.pos.endOrPoint
- tpElementInfo.setSourceRangeStart0(start)
- tpElementInfo.nameStart = start
- tpElementInfo.nameEnd = end
- tpElementInfo.setSourceRangeEnd0(end)
+ val tpPos = tpSymbol.pos
+ if(tpPos.isDefined) {
+ val start = tpPos.startOrPoint
+ val end = tpPos.endOrPoint
+ tpElementInfo.setSourceRangeStart0(start)
+ tpElementInfo.nameStart = start
+ tpElementInfo.nameEnd = end
+ tpElementInfo.setSourceRangeEnd0(end)
+ }
+ else
+ logger.debug("type parameter `%s` of `%s` has no position".format(tp.name, sym))
newElements0.put(typeParameter, tpElementInfo)
typeParameter

0 comments on commit 1d5cba9

Please sign in to comment.