tasn pushed a commit to branch master.
http://git.enlightenment.org/editors/vim-configs.git/commit/?id=c8f09305efd223cfb68200f760c5b635a55bc867
commit c8f09305efd223cfb68200f760c5b635a55bc867
Author: Tom Hacohen <t...@stosb.com>
Date: Mon Aug 4 13:53:20 2014 +0100
Edc: Migrate files from efl.git repo.
---
ftplugin/edc.vim | 1 -
snippets/edc.snippets | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++
syntax/edc.vim | 23 ++++++++----
syntax/embryo.vim | 2 +-
4 files changed, 117 insertions(+), 8 deletions(-)
diff --git a/ftplugin/edc.vim b/ftplugin/edc.vim
index be4530b..5a90a56 100644
--- a/ftplugin/edc.vim
+++ b/ftplugin/edc.vim
@@ -21,4 +21,3 @@ if exists('&ofu')
setlocal ofu=edccomplete#Complete
setlocal cfu=edccomplete#Complete
endif
-
diff --git a/snippets/edc.snippets b/snippets/edc.snippets
new file mode 100644
index 0000000..bb93e42
--- /dev/null
+++ b/snippets/edc.snippets
@@ -0,0 +1,99 @@
+snippet col
+ collections {
+ ${1}
+ }
+
+snippet images
+ images {
+ ${1}
+ }
+
+snippet image
+ image: "${1:.png}" COMP;
+
+snippet group
+ group { name: "${1}";
+ ${2}
+ parts {
+ ${3}
+ }
+ }
+
+snippet part
+ part { name: "${1}";
+ type: ${2:RECT};
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ visible: 1;
+ color: 255 255 255 255;
+ rel1 {
+ to_x: "${2:bg}";
+ to_y: "${3:bg}";
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ to_x: "${4:bg}";
+ to_y: "${5:bg}";
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ }
+ }
+
+snippet bg
+ part { name: "${1:bg}";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ visible: 1;
+ color: 0 0 0 0;
+ }
+ }
+
+snippet event
+ part { name: "${1:event}";
+ type: RECT;
+ mouse_events: 1;
+ description { state: "default" 0.0;
+ visible: 1;
+ color: 0 0 0 0;
+ }
+ }
+
+snippet IMAGE
+ part { name: "${1:image}";
+ type: IMAGE;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ visible: 1;
+ image {
+ normal: "${2}";
+ border: 0 0 0 0;
+ middle: 1;
+ }
+ }
+ }
+
+snippet desc
+ description { state: "${1}" ${2:0.0};
+ inherit: "default" 0.0;
+ ${3}
+ }
+
+snippet programs
+ programs {
+ ${1}
+ }
+
+snippet program
+ program { name: "${1}";
+ ${2}
+ }
+
+snippet clicked
+ program { name: "${1:mouse_clicked}";
+ signal: "mouse,clicked,${2:1}";
+ source: "${2:event}";
+ action: SIGNAL_EMIT "${3}" "${4}";
+ }
diff --git a/syntax/edc.vim b/syntax/edc.vim
index 58cd0b0..6d87d70 100644
--- a/syntax/edc.vim
+++ b/syntax/edc.vim
@@ -14,24 +14,26 @@ endif
" A bunch of useful keywords
syn keyword edcBlock images data fonts collections group contained
syn keyword edcBlock part parts dragable description contained
-syn keyword edcBlock text font fill origin size image contained
+syn keyword edcBlock text font fill origin size image proxy contained
syn keyword edcBlock programs program styles style contained
syn keyword edcBlock gradient spectra spectrum contained
syn keyword edcBlock color_classes color_class rel1 rel2 contained
syn keyword edcBlock items item file params externals contained
syn keyword edcBlock map rotation perspective script lua_script
contained
+syn keyword edcBlock set
syn keyword edcLabel item name alias min max type effect contained
syn keyword edcLabel mouse_events repeat_events clip_to contained
syn keyword edcLabel x y z confine events scale contained
-syn keyword edcLabel ignore_flags precise_is_inside contained
+syn keyword edcLabel ignore_flags precise_is_inside select_mode
contained
syn keyword edcLabel use_alternate_font_metrics entry_mode contained
syn keyword edcLabel source source2 source3 source4 contained
syn keyword edcLabel source5 source6 multiline pointer_mode contained
syn keyword edcLabel state visible step aspect fixed middle contained
-syn keyword edcLabel aspect_preference elipsis image contained
+syn keyword edcLabel aspect_preference ellipsis elipsis image
contained
syn keyword edcLabel relative offset to to_x to_y contained
-syn keyword edcLabel border border_scale scale_hint color color2
color3 font size contained
+syn keyword edcLabel source_visible source_clip contained
+syn keyword edcLabel border border_scale border_scale_by scale_hint
color color2 color3 font size contained
syn keyword edcLabel signal action transition in filter contained
syn keyword edcLabel target after fit align contained
syn keyword edcLabel text smooth inherit tag base style contained
@@ -41,19 +43,28 @@ syn keyword edcLabel padding prefer weight
aspect_mode contained
syn keyword edcLabel options layout position span contained
syn keyword edcLabel homogeneous contained
syn keyword edcLabel on perspective light perspective_on contained
-syn keyword edcLabel backface_cull alpha center focus zplane
contained
+syn keyword edcLabel backface_cull alpha center focus zplane focal
contained
syn keyword edcLabel int double string external script_only contained
+syn keyword edcLabel insert_before insert_after contained
syn keyword edcConstant COMP RAW LOSSY NONE ON_HOLD AUTOGRAB NOGRAB
syn keyword edcConstant TEXT IMAGE RECT TEXTBLOCK SWALLOW GRADIENT GROUP
-syn keyword edcConstant NONE PLAIN OUTLINE SOFT_OUTLINE SHADOW
+syn keyword edcConstant SPACER
+syn keyword edcConstant NONE PLAIN OUTLINE SOFT_OUTLINE SHADOW PROXY
syn keyword edcConstant SOFT_SHADOW OUTLINE_SHADOW OUTLINE_SOFT_SHADOW
syn keyword edcConstant GLOW FAR_SHADOW FAR_SOFT_SHADOW
+syn keyword edcConstant BOTTOM_RIGHT BOTTOM BOTTOM_LEFT LEFT
+syn keyword edcConstant TOP_LEFT TOP TOP_RIGHT RIGHT
syn keyword edcConstant STATE_SET ACTION_STOP SIGNAL_EMIT FOCUS_SET
syn keyword edcConstant DRAG_VAL_SET DRAG_VAL_STEP DRAG_VAL_PAGE
syn keyword edcConstant LINEAR SINUSOIDAL ACCELERATE DECELERATE
+syn keyword edcConstant LIN DECEL DIVIS BOUNCE SPRING CURRENT
+syn keyword edcConstant ACCEL_FAC DECEL_FAC SIN_FAC DIVISOR_INTERP
+syn keyword edcConstant ACCELERATE_FACTOR DECELERATE_FACTOR
syn keyword edcConstant VERTICAL HORIZONTAL BOTH BOX TABLE
syn keyword edcConstant EDITABLE PASSWORD "default"
+syn keyword edcConstant DEFAULT EXPLICIT
+syn keyword edcConstant SOLID
syn keyword edcTodo contained TODO FIXME XXX
diff --git a/syntax/embryo.vim b/syntax/embryo.vim
index b1a4060..11175d8 100644
--- a/syntax/embryo.vim
+++ b/syntax/embryo.vim
@@ -67,7 +67,7 @@ else
syn match embryoErrInBracket display contained "[);{}]"
endif
-syn region embryoBrace start='{' end='}' transparent keepend
+syn region embryoBrace start='{' end='}' transparent
"integer number, or floating point number without a dot and with "f".
syn case ignore
syn match embryoNumbers display transparent "\<\d\|\.\d"
contains=embryoNumber,embryoFloat,embryoOctalError,embryoOctal
--
