Merge lp:~maphew/leo-editor/stuff into lp:~leo-editor-team/leo-editor/contrib

[Matt Wilkie]

Adding Leo-awareness to (g)vim syntax highlighting.

[Edward K. Ream (edreamleo)]

On Sun, Dec 12, 2010 at 4:57 AM, Matt Wilkie <email address hidden> wrote:
> Matt Wilkie has proposed merging lp:~maphew/leo-editor/stuff into lp:~leo-editor-team/leo-editor/contrib.

I don't see any changes to Leo's actual source files here, so it
should be safe for merging with the trunk.

Please do so when you are ready.

Edward

[Matt Wilkie (maphew)]

Thanks Edward!

On Sun, Dec 12, 2010 at 7:37 AM, Edward K. Ream <email address hidden> wrote:
> On Sun, Dec 12, 2010 at 4:57 AM, Matt Wilkie <email address hidden> wrote:
>> Matt Wilkie has proposed merging lp:~maphew/leo-editor/stuff into lp:~leo-editor-team/leo-editor/contrib.
>
> I don't see any changes to Leo's actual source files here, so it
> should be safe for merging with the trunk.
>
> Please do so when you are ready.
>
> Edward
> --
> https://code.launchpad.net/~maphew/leo-editor/stuff/+merge/43463
> You are the owner of lp:~maphew/leo-editor/stuff.
>

--
-matt

[Matt Wilkie (maphew)]

review: Approve

=== added file 'matt-leo-contribs.leo'
--- matt-leo-contribs.leo	1970-01-01 00:00:00 +0000
+++ matt-leo-contribs.leo	2010-12-12 09:56:55 +0000
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet ekr_test?>
+<leo_file>
+<leo_header file_format="2" tnodes="0" max_tnode_index="0" clone_windows="0"/>
+<globals body_outline_ratio="0.5" body_secondary_ratio="0.5">
+	<global_window_position top="50" left="50" height="500" width="700"/>
+	<global_log_window_position top="0" left="0" height="0" width="0"/>
+</globals>
+<preferences/>
+<find_panel_settings/>
+<vnodes>
+<v t="maphew.20101201124731.3113" a="E"><vh>Leo Contribs (mine)</vh>
+<v t="matt.20101204175038.1325"><vh>@file ~/code/o4w/apt/apt.py</vh></v>
+<v t="matt.20101212004153.1367" a="E"><vh>Vim-Syntax</vh>
+<v t="matt.20101212004153.1446" a="E"
+expanded="matt.20101212004153.1442,"><vh>@file filetype.vim</vh></v>
+<v t="maphew.20101201124731.3123" a="E"><vh>@file leo_syntax.vim</vh></v>
+<v t="matt.20101212004153.1440"
+expanded="matt.20101212004153.1442,"><vh>@file ~/.vim/after/filetype.vim</vh></v>
+<v t="matt.20101204175038.1322" a="E"><vh>@file ~/.vim/after/leo_syntax.vim</vh></v>
+<v t="matt.20101204140731.1281"><vh>tests</vh>
+<v t="matt.20101204175038.1325"></v>
+<v t="maphew.20101201124731.3120"><vh>@@file test.py</vh>
+<v t="matt.20101128004159.1266"><vh>Level One</vh>
+<v t="matt.20101128232629.1271"><vh>Level Two</vh></v>
+</v>
+</v>
+<v t="maphew.20101201124731.3114"><vh>@@file test.html</vh>
+<v t="matt.20101128004159.1266"></v>
+</v>
+<v t="maphew.20101201124731.3117"><vh>@@file test.css</vh>
+<v t="matt.20101128004159.1266"></v>
+</v>
+</v>
+<v t="matt.20101204175038.1323"><vh>@url appending syntax</vh></v>
+<v t="matt.20101204175038.1324"><vh>@url new filetype</vh></v>
+</v>
+</v>
+</vnodes>
+<tnodes>
+<t tx="maphew.20101201124731.3113">
+
+
+</t>
+<t tx="maphew.20101201124731.3114">@language html
+@others
+</t>
+<t tx="maphew.20101201124731.3117">@language css
+@others
+</t>
+<t tx="maphew.20101201124731.3120">@language python
+@others
+</t>
+<t tx="matt.20101128004159.1266">Some text in body of level one
+@ followed by
+/*
+/*
+/*
+/*
+/*
+/*
+multiline 
+comment
+*/
+*/
+*/
+*/
+*/
+*/
+</t>
+<t tx="matt.20101128232629.1271">this is body
+of level 2
+</t>
+<t tx="matt.20101204140731.1281">@path tests</t>
+<t tx="matt.20101204175038.1323">http://vimdoc.sourceforge.net/htmldoc/syntax.html#mysyntaxfile-add</t>
+<t tx="matt.20101204175038.1324">http://vimdoc.sourceforge.net/htmldoc/filetype.html#new-filetype</t>
+<t tx="matt.20101212004153.1367">@path vim-syntax
+Towards Leo-aware syntax highlighting in vim.
+@url https://code.launchpad.net/~maphew/leo-editor/stuff</t>
+</tnodes>
+</leo_file>

=== added directory 'vim-syntax'
=== added file 'vim-syntax/filetype.vim'
--- vim-syntax/filetype.vim	1970-01-01 00:00:00 +0000
+++ vim-syntax/filetype.vim	2010-12-12 09:56:55 +0000
@@ -0,0 +1,20 @@
+"@+leo-ver=5-thin
+"@+node:matt.20101212004153.1446: * @file filetype.vim
+"@@language vim
+"@+others
+"@+node:matt.20101212004153.1442: ** main
+" Leo editor additions
+" to activate save this file as ~/.vim/after/filetype.vim
+
+if !exists("after_autocmds_loaded")
+    let after_autocmds_loaded = 1
+    au BufNewFile,BufRead * source ~/.vim/after/leo_syntax.vim
+endif
+"@+node:matt.20101212004153.1441: *3* notes
+"@+at
+" The name 'filetype.vim' seems to be sourced BEFORE the syntax files, even when
+" in 'after' dir, so it gets overwritten by the default syntax file. Therefore we
+" resort to this.
+" @url http://stackoverflow.com/questions/4301716/extend-modify-vim-highlighting-for-all-filetypes-at-once/4301809#4301809
+"@-others
+"@-leo

=== added file 'vim-syntax/leo_syntax.vim'
--- vim-syntax/leo_syntax.vim	1970-01-01 00:00:00 +0000
+++ vim-syntax/leo_syntax.vim	2010-12-12 09:56:55 +0000
@@ -0,0 +1,43 @@
+"@+leo-ver=5-thin
+"@+node:maphew.20101201124731.3123: * @file leo_syntax.vim
+"@@language vim
+"@+others
+"@+node:matt.20101204175038.1321: ** main
+" Leo editor additions
+" to activate change save this file as ~/.vim/after/leo_syntax.vim
+
+" --- Leo directive ---
+" We assume anything with one of @@, @+, @- near line start is a leo headline/directive.
+" Examples:
+"		#@+leo-ver=5-thin
+"		#@+node:johndoe.20100928224755.1557: * @file foobar.py
+"		#@@first
+"		#@+<<docstring> >
+"
+" Search pattern break down:
+"
+"	^		beginning of line
+"	.		any single character
+"	\{,4}	0 to 4 of preceeding pattern (any single character in this case)
+"	\zs		Set start of match here (http://vimhelp.appspot.com/pattern.txt.html#%2F\zs)
+"	@[@\-+]	match any of: @@, @+, @-
+"	.*		include everything after, to end of line
+"
+"	(better but too hard(?): match only if preceding character is a known comment delimeter)
+
+syn match   leoSentinel  "^.\{,4}\zs@[@\-+].*"	 containedin=ALL
+	" why did this stop this working with html files?
+
+" Resume normal emphasis within leoHeadline after last asterisk (*)
+" Idea is to keep the node's name (headline contents) prominent
+syn match   Comment         "\* .*$"hs=s+1  containedin=leoSentinel
+
+highlight leoSentinel guifg=grey ctermfg=darkgrey
+
+
+" Wishlist:
+"	- background highlight entire node line. Idea is to still communicate or delineate the Leo node boundaries, but hide the noisy stuff. As is now the headline text kind of floats in the middle of nowhere.
+"	- would rather the headline colour say 'x% lighter than comment colour, in same hue'. This would be more adaptable to different colour schemes.
+"
+"@-others
+"@-leo

=== added directory 'vim-syntax/tests'
=== added file 'vim-syntax/tests/test.css'
--- vim-syntax/tests/test.css	1970-01-01 00:00:00 +0000
+++ vim-syntax/tests/test.css	2010-12-12 09:56:55 +0000
@@ -0,0 +1,28 @@
+/*@+leo-ver=5-thin*/
+/*@+node:maphew.20101201124731.3117: * @file test.css*/
+/*@@language css*/
+/*@+others*/
+/*@+node:matt.20101128004159.1266: ** Level One*/
+Some text in body of level one
+/*@+at followed by*/
+/*
+/*
+/*
+/*
+/*
+/*
+/*
+multiline 
+comment
+*/
+*/
+*/
+*/
+*/
+*/
+*/
+/*@+node:matt.20101128232629.1271: *3* Level Two*/
+this is body
+of level 2
+/*@-others*/
+/*@-leo*/

=== added file 'vim-syntax/tests/test.html'
--- vim-syntax/tests/test.html	1970-01-01 00:00:00 +0000
+++ vim-syntax/tests/test.html	2010-12-12 09:56:55 +0000
@@ -0,0 +1,28 @@
+<!--@+leo-ver=5-thin-->
+<!--@+node:maphew.20101201124731.3114: * @file test.html-->
+<!--@@language html-->
+<!--@+others-->
+<!--@+node:matt.20101128004159.1266: ** Level One-->
+Some text in body of level one
+<!--@+at followed by-->
+<!--
+/*
+/*
+/*
+/*
+/*
+/*
+multiline 
+comment
+*/
+*/
+*/
+*/
+*/
+*/
+-->
+<!--@+node:matt.20101128232629.1271: *3* Level Two-->
+this is body
+of level 2
+<!--@-others-->
+<!--@-leo-->

=== added file 'vim-syntax/tests/test.py'
--- vim-syntax/tests/test.py	1970-01-01 00:00:00 +0000
+++ vim-syntax/tests/test.py	2010-12-12 09:56:55 +0000
@@ -0,0 +1,26 @@
+#@+leo-ver=5-thin
+#@+node:maphew.20101201124731.3120: * @file test.py
+#@@language python
+#@+others
+#@+node:matt.20101128004159.1266: ** Level One
+Some text in body of level one
+#@+at followed by
+# /*
+# /*
+# /*
+# /*
+# /*
+# /*
+# multiline 
+# comment
+# */
+# */
+# */
+# */
+# */
+# */
+#@+node:matt.20101128232629.1271: *3* Level Two
+this is body
+of level 2
+#@-others
+#@-leo