summaryrefslogtreecommitdiff
path: root/src/intellij
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-03-04 05:22:57 +0000
committerPaul Phillips <paulp@improving.org>2010-03-04 05:22:57 +0000
commit34b8e8fcbbb1b11ce81bf69b730abcb78b6699ec (patch)
treeb2ae69f2731acde0ec4b921cf2e1a73295ea3250 /src/intellij
parent65520ac86f5362bfa438c0b9e1a84f1f558e2618 (diff)
downloadscala-34b8e8fcbbb1b11ce81bf69b730abcb78b6699ec.tar.gz
scala-34b8e8fcbbb1b11ce81bf69b730abcb78b6699ec.tar.bz2
scala-34b8e8fcbbb1b11ce81bf69b730abcb78b6699ec.zip
A few yards short of the goal posts attempt at ...
A few yards short of the goal posts attempt at making our usage of Throwable subclasses more consistent. This patch eliminates a lot of ad hoc Exception/Error/etc. creation and various arbitrary choices are rendered slightly less arbitrary. From now on let's try not to use the word "Exception" or "Error" in the names of Throwable subclasses unless they actually derive (and make sense to derive) from Exception or Error. Review by community.
Diffstat (limited to 'src/intellij')
-rw-r--r--src/intellij/scala-lang.ipr2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/intellij/scala-lang.ipr b/src/intellij/scala-lang.ipr
index 8a801be5db..45af31680c 100644
--- a/src/intellij/scala-lang.ipr
+++ b/src/intellij/scala-lang.ipr
@@ -999,7 +999,7 @@
<file url="file://$PROJECT_DIR$/../dotnet-library/scala/reflect/Manifest.scala" />
<file url="file://$PROJECT_DIR$/../dotnet-library/scala/reflect/ScalaBeanInfo.scala" />
<file url="file://$PROJECT_DIR$/../dotnet-library/scala/runtime/MethodCache.scala" />
- <file url="file://$PROJECT_DIR$/../dotnet-library/scala/runtime/NonLocalReturnException.scala" />
+ <file url="file://$PROJECT_DIR$/../dotnet-library/scala/runtime/NonLocalReturnControl.scala" />
<file url="file://$PROJECT_DIR$/../dotnet-library/scala/runtime/RichChar.scala" />
<file url="file://$PROJECT_DIR$/../dotnet-library/scala/runtime/RichClass.scala" />
<file url="file://$PROJECT_DIR$/../dotnet-library/scala/runtime/RichDouble.scala" />