snippet improvements

HaxeComplete.py

@@ -640,9 +640,11 @@ def find_nmml( self, folder ) :
                         if not mFile is None:
                             outp = mFile.group(2)
                     elif (tag == "haxelib"):
+                        # temporary fix #175
                         if name == 'openfl':
                             currentBuild.libs.append( HaxeLib.get( 'lime' ) )
                             currentBuild.args.append( ('-lib' , 'lime') )
+                        # end temporary fix #175
                         currentBuild.libs.append( HaxeLib.get( name ) )
                         currentBuild.args.append( ("-lib" , name) )
                     elif (tag == "haxedef"):

Snippets/class.sublime-snippet

@@ -1,11 +1,10 @@
 <snippet>
-    <content><![CDATA[class ${1:class_name}
-{
-	public function new(){
+	<content><![CDATA[class ${1:name}$HX_W_OCB{
+	public function new$HX_W_ORB()$HX_W_OCB{
 		${0:$TM_SELECTED_TEXT}
 	}
 }]]></content>
-    <tabTrigger>class</tabTrigger>
-    <scope>source.haxe.2</scope>
-    <description>Class</description>
+	<tabTrigger>class</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>Class</description>
 </snippet>

Snippets/do-while.sublime-snippet

@@ -0,0 +1,8 @@
+<snippet>
+	<content><![CDATA[do${2:$HX_W_OCB{
+	${3:$TM_SELECTED_TEXT}$0
+\}}${HX_CCB_W}while$HX_K_W_ORB(${1:condition});]]></content>
+	<tabTrigger>do</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>do while</description>
+</snippet>

Snippets/enum.sublime-snippet

@@ -1,9 +1,8 @@
 <snippet>
-    <content><![CDATA[enum ${1:enum_name}
-{
+	<content><![CDATA[enum ${1:name}$HX_W_OCB{
 	${0:$TM_SELECTED_TEXT}
 }]]></content>
-    <tabTrigger>enum</tabTrigger>
-    <scope>source.haxe.2</scope>
-    <description>Enum</description>
+	<tabTrigger>enum</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>Enum</description>
 </snippet>

Snippets/for.sublime-snippet

@@ -0,0 +1,8 @@
+<snippet>
+	<content><![CDATA[for$HX_K_W_ORB($HX_ORB_W${1:i} in ${2:0$HX_W_TD...$HX_TD_W${3:n}}$HX_W_CRB)${4:$HX_W_OCB{
+	${5:$TM_SELECTED_TEXT}$0
+\}}]]></content>
+	<tabTrigger>for</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>for</description>
+</snippet>

Snippets/function-(f).sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <content><![CDATA[function($1) {${0:$TM_SELECTED_TEXT}};]]></content>
+    <content><![CDATA[function$HX_K_W_ORB($1)$HX_K_W_ORB{${0:$TM_SELECTED_TEXT}};]]></content>
     <tabTrigger>f</tabTrigger>
     <scope>source.haxe.2</scope>
     <description>Anonymous Function (f)</description>

Snippets/function-(fun).sublime-snippet

@@ -1,9 +1,8 @@
 <snippet>
-    <content><![CDATA[function ${1:function_name}(${2:arguments})${3::${4:Void}}
-{
-	${0:$TM_SELECTED_TEXT}
-}]]></content>
-    <tabTrigger>fun</tabTrigger>
-    <scope>source.haxe.2</scope>
-    <description>Function (fun)</description>
+	<content><![CDATA[${1:public }function ${2:name}$HX_W_ORB(${3:args})${4:$HX_W_C:$HX_C_W${5:Void}}${6:$HX_W_OCB{
+	${7:$TM_SELECTED_TEXT}$0
+\}}]]></content>
+	<tabTrigger>fun</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>function</description>
 </snippet>

Snippets/if-else-(ife).sublime-snippet

@@ -0,0 +1,10 @@
+<snippet>
+	<content><![CDATA[if$HX_K_W_ORB(${1:condition})$HX_W_OCB{
+	${0:$TM_SELECTED_TEXT}
+}${HX_CCB_W}else$HX_W_OCB{
+	
+}]]></content>
+	<tabTrigger>ife</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>if-else (ife)</description>
+</snippet>

Snippets/if.sublime-snippet

@@ -1,7 +1,7 @@
 <snippet>
-    <content><![CDATA[if(${1:true}){
-      ${0:$TM_SELECTED_TEXT}
-}]]></content>
+    <content><![CDATA[if$HX_K_W_ORB($HX_ORB_W${1:condition}$HX_W_CRB)${2:$HX_W_OCB{
+	${3:$TM_SELECTED_TEXT}$0
+\}}]]></content>
     <tabTrigger>if</tabTrigger>
     <scope>source.haxe.2</scope>
     <description>if</description>

Snippets/interface.sublime-snippet

@@ -1,9 +1,8 @@
 <snippet>
-    <content><![CDATA[interface ${1:interface_name}
-{
-    ${0:$TM_SELECTED_TEXT}	
+	<content><![CDATA[interface ${1:name}$HX_W_OCB{
+	${0:$TM_SELECTED_TEXT}	
 }]]></content>
-    <tabTrigger>interface</tabTrigger>
-    <scope>source.haxe.2</scope>
-    <description>Interface</description>
+	<tabTrigger>interface</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>Interface</description>
 </snippet>

Snippets/main.sublime-snippet

@@ -1,16 +1,15 @@
 <snippet>
-    <content><![CDATA[class ${1:class_name}
-{
-	public function new()$TM_CSLB{
-		${0}
+	<content><![CDATA[class ${1:name}$HX_W_OCB{
+	
+	public function new$HX_W_ORB()$HX_W_OCB{
+		$0
 	}
 
-	static public function main()
-  {
-		var app = new ${1:class_name}();
+	static public function main$HX_W_ORB()$HX_W_OCB{
+		var app$HX_W_A=${HX_A_W}new $1$HX_W_ORB()$HX_W_SC;
 	}
 }]]></content>
-    <tabTrigger>main</tabTrigger>
-    <scope>source.haxe.2</scope>
-    <description>Main class</description>
+	<tabTrigger>main</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>Main class</description>
 </snippet>

Snippets/property-(prop).sublime-snippet

@@ -1,12 +1,14 @@
 <snippet>
-    <content><![CDATA[public var ${1:var_name}(get_${1:var_name}, set_${1:var_name}):${2:var_type};
-private var _${1:var_name}:${2:var_type};
+	<content><![CDATA[public var ${1:name}$HX_W_ORB(${HX_ORB_W}get_${1:name}$HX_W_CM,${HX_CM_W}set_${1:name}$HX_W_CRB)$HX_CRB_C:$HX_C_W${2:type};
+private var _$1$HX_W_C:$HX_C_W$2;
 
-function get_${1:var_name}():${2:var_type} { return _${1:var_name}; }
-function set_${1:var_name}(value:${2:var_type}):${2:var_type}$TM_CSLB{
-	return _${1:var_name} = value;
+function get_$1$HX_W_ORB()$HX_CRB_W_C:$HX_C_W$2$HX_W_OCB{
+	return _$1;
+}
+function set_$1(value$HX_W_C:$HX_C_W$2)$HX_CRB_W_C:$HX_C_W$2$HX_W_OCB{
+	return _$1$HX_W_A=${HX_A_W}value;
 }]]></content>
-    <tabTrigger>prop</tabTrigger>
-    <scope>source.haxe.2</scope>
-    <description>Property with getter/setter (prop)</description>
+	<tabTrigger>prop</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>Property with getter/setter (prop)</description>
 </snippet>

Snippets/switch.sublime-snippet

@@ -1,8 +1,8 @@
 <snippet>
-    <content><![CDATA[switch (${1:$TM_SELECTED_TEXT}) {
-	case:
+	<content><![CDATA[switch$HX_K_W_ORB(${1:$TM_SELECTED_TEXT})$HX_W_OCB{
+	case ${2:pattern}$HX_W_C:$HX_C_W$0
 }]]></content>
-    <tabTrigger>switch</tabTrigger>
-    <scope>source.haxe.2</scope>
-    <description>switch</description>
+	<tabTrigger>switch</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>switch</description>
 </snippet>

Snippets/this-(this).sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <content><![CDATA[this.${1:property} = ${1:arg};]]></content>
+    <content><![CDATA[this.${1:property}$HX_W_A=$HX_A_W$1;]]></content>
     <tabTrigger>this</tabTrigger>
     <scope>source.haxe.2</scope>
     <description>Constructor Property (this)</description>

Snippets/var-(v).sublime-snippet

@@ -1,6 +1,6 @@
 <snippet>
-    <content><![CDATA[var ${1:var_name}${2::${3:Void}}${4: = ${5:value}};]]></content>
-    <tabTrigger>v</tabTrigger>
-    <scope>source.haxe.2</scope>
-    <description>Variable</description>
+	<content><![CDATA[var ${1:name}${2:$HX_W_C:$HX_C_W${3:Dynamic}}${4:$HX_W_A=$HX_A_W${5:value}};]]></content>
+	<tabTrigger>v</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>Variable</description>
 </snippet>

Snippets/while.sublime-snippet

@@ -0,0 +1,8 @@
+<snippet>
+	<content><![CDATA[while$HX_K_W_ORB(${1:condition})${2:$HX_W_OCB{
+	${3:$TM_SELECTED_TEXT}$0
+\}}]]></content>
+	<tabTrigger>while</tabTrigger>
+	<scope>source.haxe.2</scope>
+	<description>while</description>
+</snippet>

Support/Haxe.sublime-settings

@@ -23,14 +23,30 @@
 	"haxe_modifiers_order" : "opis",
 
 	/*
-		Whitespace style used in generated code
+		Whitespace style used in generated code and snippets
 		Examples:
 		"function f ( a : T < T > , b : T = null ) : T -> T;"
 		"function f ( a:T<T> , b:T=null ):T->T;"
 		"function f(a:T<T>, b:T = null):T->T;"
 	*/
 	"haxe_whitespace_style" : "function f(a:T<T>, b:T = null):T->T;",
 
+	/*
+		Whitespace style used in generated code and snippets
+		Examples:
+		"for(i in 0...5)"
+		"for (i in 0 ... 5)"
+	*/
+	"haxe_whitespace_style2" : "for (i in 0 ... 5)",
+
+	/*
+		Brace style used in generated code and snippets
+		Examples:
+		"}\nelse\n{"
+		"} else {"
+	*/
+	"haxe_brace_style" : "} else {",
+
 	"haxe_use_cache" : true,
 
 	/*

features/__init__.py

@@ -8,13 +8,14 @@
 from .haxe_show_type import HaxeShowType
 from .haxe_add_hxml import HaxeAddHxml
 from .haxe_generate_code import HaxeGenerateCode
-from .haxe_generate_code_helper import HaxeGenerateCodeEdit
-from .haxe_generate_field import HaxeGenerateField
+from .haxe_generate_code_helper import *
+from .haxe_generate_field import HaxeGenerateField, HaxeGenerateFieldEdit
 from .haxe_extract_var import HaxeExtractVar
 from .haxe_hint import HaxeHint, HaxeShowPopup, HaxeColorScheme
 from .haxe_implement_interface import HaxeImplementInterface
 from .haxe_organize_imports import HaxeOrganizeImports, HaxeOrganizeImportsEventListener, HaxeOrganizeImportsEdit
 from .haxe_reload_modules import reload_modules
+from .haxe_format import HaxeFormat
 from .haxe_helper import *
 
 print("Haxe : Reloading haxe module")