d6
/
pmacs3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scala indenting fixes 

--HG--
branch : pmacs2
This commit is contained in:
Erik Osheim 2013-07-28 22:44:26 -04:00
parent dd361e63e9
commit 066d826fc9
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mode/scala.py
View File

@ -129,6 +129,7 @@ class ScalaTabber(StackTabber2):
control_tokens = {'scala.reserved': set(['if', 'else', 'while', 'do', 'for'])} control_tokens = {'scala.reserved': set(['if', 'else', 'while', 'do', 'for'])}
case_tokens = {'scala.reserved': set(['case'])} case_tokens = {'scala.reserved': set(['case'])}
case_delim_tokens = {'delimiter': set(['=>'])} case_delim_tokens = {'delimiter': set(['=>'])}
continue_tokens = {'delimiter': set(['='])}
end_at_eof = True end_at_eof = True
start_free_tokens = {'string.start': 'string.end'} start_free_tokens = {'string.start': 'string.end'}
end_free_tokens = {'string.end': 'string.start'} end_free_tokens = {'string.end': 'string.start'}

1
tab.py
View File

@ -433,6 +433,7 @@ class StackTabber2(Tabber):
# if we don't want implicit continuation, return. # if we don't want implicit continuation, return.
if self.end_at_eof: if self.end_at_eof:
self._pop_while('continue', 'control', 'pre-control')
return return
# ok, if we are closing a block then this will end a "single-statement" # ok, if we are closing a block then this will end a "single-statement"