diff options
| author | michelou <michelou@epfl.ch> | 2005-06-14 17:16:41 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-06-14 17:16:41 +0000 |
| commit | c27b04348a46df90feedbdee8842da91729ebb5a (patch) | |
| tree | 025e7b9a91d14208878af62b63bdb4c45a5d9570 /support | |
| parent | ed271f43796435097e1e262ac77d291082be99f4 (diff) | |
| download | scala-c27b04348a46df90feedbdee8842da91729ebb5a.tar.gz scala-c27b04348a46df90feedbdee8842da91729ebb5a.tar.bz2 scala-c27b04348a46df90feedbdee8842da91729ebb5a.zip | |
- added 'implicit' and 'match' keywords.
Diffstat (limited to 'support')
| -rw-r--r-- | support/jedit/modes/scala.xml | 2 | ||||
| -rw-r--r-- | support/scite/scala.properties | 4 | ||||
| -rw-r--r-- | support/textpad/scala.syn | 3 | ||||
| -rw-r--r-- | support/ultraedit/scala.txt | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/support/jedit/modes/scala.xml b/support/jedit/modes/scala.xml index 64e22f718d..a4b8421686 100644 --- a/support/jedit/modes/scala.xml +++ b/support/jedit/modes/scala.xml @@ -122,7 +122,9 @@ <KEYWORD1>finally</KEYWORD1> <KEYWORD1>for</KEYWORD1> <KEYWORD1>if</KEYWORD1> + <KEYWORD1>implicit</KEYWORD1> <KEYWORD1>import</KEYWORD1> + <KEYWORD1>match</KEYWORD1> <KEYWORD1>new</KEYWORD1> <KEYWORD1>null</KEYWORD1> <KEYWORD1>object</KEYWORD1> diff --git a/support/scite/scala.properties b/support/scite/scala.properties index 07b4b680c7..440baf63ba 100644 --- a/support/scite/scala.properties +++ b/support/scite/scala.properties @@ -14,8 +14,8 @@ use.tabs.$(file.patterns.scala)=2 keywordclass.scala= \ abstract case catch class def do else extends \ -false final finally for if import new object override \ -package private protected return sealed \ +false final finally for if implicit import match new \ +object override package private protected return sealed \ throw trait true try type val var with while yield @ =>
keywords.$(file.patterns.scala)=$(keywordclass.scala)
diff --git a/support/textpad/scala.syn b/support/textpad/scala.syn index c83a01ed23..6c6e1dde80 100644 --- a/support/textpad/scala.syn +++ b/support/textpad/scala.syn @@ -83,6 +83,8 @@ while [Keywords 2] ; new ones added by Scala def +implicit +match object val var @@ -589,7 +591,6 @@ Symbol length main println -match toString isInstanceOf asInstanceOf diff --git a/support/ultraedit/scala.txt b/support/ultraedit/scala.txt index c44e70a3d9..3aa358bea4 100644 --- a/support/ultraedit/scala.txt +++ b/support/ultraedit/scala.txt @@ -11,7 +11,8 @@ case catch class def do else extends false final finally for -if import +if implicit import +match new null object override package private protected |