Improve yasnippets and enable yas-minor-mode on html-mode.

configs/base-extensions.el

@@ -147,7 +147,10 @@
   :config
   (yas-reload-all)
   :hook
-  ((prog-mode feature-mode)  . yas-minor-mode))
+  ((prog-mode feature-mode)  . yas-minor-mode-on)
+  (html-mode . yas-minor-mode))
+
+(use-package yasnippet-snippets :ensure t :defer t)
 
 ;; Restaurar el estado de los frames
 (use-package winner

snippets/css-mode/import

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: @import
-# key: imp
-# uuid: imp
-# --
-@import "`(doom-snippets-text nil t)`$0";

snippets/css-mode/importfont

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: @import url("//fonts.googleapis...")
-# key: impfont
-# uuid: impfont
-# --
-@import url("http://fonts.googleapis.com/css?family=${1:Open+Sans}");

snippets/css-mode/importurl

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: @import url(...)
-# key: impurl
-# uuid: impurl
-# --
-@import url("`(doom-snippets-text nil t)`$0");

snippets/css-mode/margin

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: margin: ...;
-# key: mar
-# uuid: mar
-# --
-margin: ${1:0 auto};

snippets/css-mode/media

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: @media
-# key: med
-# uuid: med
-# --
-@media ${1:screen} {
-    `%`$0
-}

snippets/css-mode/media_orientation

@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: @media (orientation: ?)
-# condition: (looking-back "@media " (line-beginning-position))
-# --
-(orientation: ${1:landscape})

snippets/css-mode/media_print

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: @media print { ... }
-# --
-@media print {
-    `%`$0
-}

snippets/css-mode/padding

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: padding: ...;
-# key: pad
-# uuid: pad
-# --
-padding: ${1:10px};

snippets/css-mode/property

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: ...: ...;
-# key: :
-# uuid: :
-# --
-${1:prop}: ${2:`%`};

snippets/go-mode/append

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: append
-# --
-${1:type} = append($1, ${2:elems})

snippets/go-mode/coloneq

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: ... := ...
-# key: :=
-# uuid: :=
-# --
-${1:x} := ${2:`%`}

snippets/go-mode/const

@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Seong Yong-ju
-# name: const ... = ...
-# --
-const ${1:name}${2: type} = ${3:value}$0

snippets/go-mode/ctxc

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: ctx context.Context
-# --
-ctx context.Context

snippets/go-mode/f

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: func ...(...) ... { ... }
-# --
-func ${1:name}(${2:args})${3: return type} {
-    `%`$0
-}

snippets/go-mode/fm

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: func (target) name(args) (results) { ... }
-# --
-func (${1:target}) ${2:name}(${3:args})${4: return type} {
-    $0
-}

snippets/go-mode/for

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: for ... { ... }
-# --
-for $1 {
-    `%`$0
-}

snippets/go-mode/fore

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: for key, value := range ... { ... }
-# --
-for ${1:key}, ${2:value} := range ${3:target} {
-    `%`$0
-}

snippets/go-mode/foreach

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: for key, value := range ... { ... }
-# --
-for ${1:key}, ${2:value} := range ${3:target} {
-    `%`$0
-}

snippets/go-mode/fori

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: for i := 0; i < n; i++ { ... }
-# --
-for ${1:i} := ${2:0}; $1 < ${3:10}; $1++ {
-    `%`$0
-}

snippets/go-mode/forw

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: for ... { ... }
-# --
-for $1 {
-    `%`$0
-}

snippets/go-mode/func

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: func ...(...) ... { ... }
-# --
-func ${1:name}(${2:args})${3: return type} {
-    `%`$0
-}

snippets/go-mode/go

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: go
-# --
-go ${1:func}(${2:args})$0

snippets/go-mode/gof

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: go func
-# --
-go func (${1:args}) {
-    $0
-}(${2:values})

snippets/go-mode/gofunc

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: go func (short)
-# --
-go func (${1:args}) {
-    $0
-}(${2:values})

snippets/go-mode/if

@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Seong Yong-ju
-# name: if ... { ... }
-# --
-if ${1:condition} {
-	`%`$0
-}

snippets/go-mode/ife

@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Seong Yong-ju
-# name: if ... { ... } else { ... }
-# --
-if ${1:condition} {
-	`%`$2
-} else {
-	$0
-}

snippets/go-mode/iferr

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: if err != nil { ... }
-# --
-if err != nil {
-    `%`$0
-}

snippets/go-mode/imp

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: import
-# --
-import ${1:package}$0

snippets/go-mode/import

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: import
-# --
-import ${1:package}$0

snippets/go-mode/interface

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: type ... interface { ... }
-# --
-type $1 interface {
-    `%`$0
-}

snippets/go-mode/main

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: func main() { ... }
-# --
-func main() {
-   $0
-}

snippets/go-mode/map

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: map
-# --
-map[${1:KeyType}]${2:ValueType}

snippets/go-mode/method

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: func (target) name(args) (results) { ... }
-# --
-func (${1:target}) ${2:name}(${3:args})${4: return type} {
-    $0
-}

snippets/go-mode/package

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: package
-# --
-package ${1:`(car (last (split-string (file-name-directory buffer-file-name) "/") 2))`}

snippets/go-mode/pkg

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: package (short)
-# --
-package ${1:`(car (last (split-string (file-name-directory buffer-file-name) "/") 2))`}

snippets/go-mode/pr

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: printf
-# --
-fmt.Printf("$1\n"${2:, ${3:str}})

snippets/go-mode/printf

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: printf
-# --
-fmt.Printf("$1\n"${2:, ${3:str}})

snippets/go-mode/println

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: println
-# --
-fmt.Println("${1:msg}")$0

snippets/go-mode/prln

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: println (short)
-# --
-fmt.Println("${1:msg}")$0

snippets/go-mode/select

@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: select
-# --
-select {
-      case ${1:cond}:
-      $0
-}

snippets/go-mode/struct

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: type ... struct { ... }
-# --
-type $1 struct {
-    `%`$0
-}

snippets/go-mode/switch

@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: switch
-# key: switch
-# uuid: switch
-# --
-switch {
-    case ${1:cond}:
-         $0
-}

snippets/go-mode/test

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: func Test...() { ... }
-# --
-func Test${1:Name}(${2:t *testing.T}) {
-    `%`$0
-}

snippets/go-mode/var

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: var
-# --
-var ${1:name} ${2:type} = ${3:value}$0

snippets/go-mode/while

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name : for ... { ... }
-# --
-for $1 {
-    `%`$0
-}

snippets/go-mode/wr

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: http request writer
-# --
-w http.ResponseWriter, r *http.Request

snippets/html-mode/dd

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Rodrigo Setti <rodrigosetti@gmail.com>
-# name: <dd> ... </dd>
-# group: list
-# --
-<dd>$1</dd>

snippets/html-mode/dl

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Rodrigo Setti <rodrigosetti@gmail.com>
-# name: <dl> ... </dl>
-# group: list
-# --
-<dl>
-    $0
-</dl>

snippets/html-mode/doctype

@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: Doctype HTML 5
-# group: meta
-# --
-<!DOCTYPE html>

snippets/html-mode/doctype.xhml1

@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: DocType XHTML 1.0 frameset
-# group: meta
-# --
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">

snippets/html-mode/doctype.xhtml1_1

@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: DocType XHTML 1.1
-# group: meta
-# --
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

snippets/html-mode/doctype.xhtml1_strict

@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: DocType XHTML 1.0 Strict
-# group: meta
-# --
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

snippets/html-mode/doctype.xhtml1_transitional

@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: DocType XHTML 1.0 Transitional
-# group: meta
-# --
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

snippets/html-mode/dt

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Rodrigo Setti <rodrigosetti@gmail.com>
-# name: <dt> ... </dt>
-# group: list
-# --
-<dt>$1</dt>

snippets/html-mode/form

@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <form method="..." id="..." action="..."></form>
-# --
-<form method="$1" id="$2" action="$3">
-  $0
-</form>

snippets/html-mode/html

@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <html>...</html>
-# --
-<html>
-  $0
-</html>

snippets/html-mode/html.xmlns

@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <html xmlns="...">...</html>
-# --
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="${1:en}" lang="${2:en}">
-  $0
-</html>

snippets/html-mode/link

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: <link rel="stylesheet" ... />
-# key: link
-# uuid: link
-# --
-<link rel="${1:stylesheet}" href="${2:url}" type="${3:text/css}" media="${4:screen}" />

snippets/html-mode/linkie

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: <!--[if IE]><link stylesheet="..." /><![endif]-->
-# --
-<!--[if IE${1: version}]>
-<link rel="${2:stylesheet}" href="${3:url}" type="${4:text/css}" media="${5:screen}" />
-<![endif]-->

snippets/html-mode/mailto

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: <a href="mailto:...@...">...</a>
-# --
-<a href="mailto:${1:john@doe.com}">`(doom-snippets-format "%n%s%n")`$0</a>

snippets/html-mode/meta

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor : Jimmy Wu <frozenthrone88@gmail.com>
-# group: meta
-# name: <meta name="..." content="..." />
-# --
-<meta name="${1:generator}" content="${2:content}" />

snippets/html-mode/meta.http-equiv

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <meta http-equiv="..." content="..." />
-# group: meta
-# --
-<meta name="${1:Content-Type}" content="${2:text/html; charset=UTF-8}" />

snippets/html-mode/script

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: <script type="text/javascript">...</script>
-# --
-<script type="text/javascript">
-  $0
-</script>

snippets/html-mode/scriptsrc

@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: <script type="text/javascript" src="..."></script>
-# --
-<script type="text/javascript" src="$1"></script>

snippets/html-mode/textarea

@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <textarea ...></textarea>
-# --
-<textarea name="$1" id="$2" rows="$3" cols="$4" tabindex="$5"></textarea>

snippets/html-mode/th

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# contributor: Jimmy Wu <frozenthrone88@gmail.com>
-# name: <th>...</th>
-# group: table
-# --
-<th$1>$2</th>

snippets/java-mode/@param

@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: param
-# key: @param
-# uuid: @param
-# condition: (sp-point-in-comment)
-# --
-@param ${1:paramater} $0

snippets/java-mode/@return

@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: return
-# key: @return
-# uuid: @return
-# condition: (sp-point-in-comment)
-# --
-@return ${1:description}

snippets/java-mode/apr_assert

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: apr_assert
-# key: apr_assert
-# uuid: apr_assert
-# --
-if (Globals.useAssertions) {
-   ${1:assert ..};
-}

snippets/java-mode/class

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: class
-# key: class
-# uuid: class
-# --
-${1:public }class ${2:`(f-base buffer-file-name)`} {
-           $0
-}

snippets/java-mode/constructor

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: constructor
-# key: __init__
-# uuid: __init__
-# --
-public ${1:`(f-base buffer-file-name)`}($2) {
-       $0
-}

snippets/java-mode/doc

@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: doc
-# key: /*
-# uuid: /*
-# condition: (not (use-region-p))
-# --
-/**
- * $0
- */

snippets/java-mode/equals

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: equals
-# key: eq
-# uuid: eq
-# --
-public boolean equals(${1:Class} other) {
-       $0
-}

snippets/java-mode/file_class

@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: file_class
-# key: file
-# uuid: file
-# --
-public class ${1:`(file-name-base
-                    (or (buffer-file-name)
-                        (buffer-name)))`} {
-  $0
-}

snippets/java-mode/for

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: for
-# key: for
-# uuid: for
-# --
-for (${1:int i = 0}; ${2:i < N}; ${3:i++}) {
-    `%`$0
-}

snippets/java-mode/foreach

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: foreach
-# key: fore
-# uuid: fore
-# --
-for (${1:Object} ${2:var} : ${3:iterator}) {
-    $0
-}

snippets/java-mode/if

@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: if
-# key: if
-# uuid: if
-# condition: (not (sp-point-in-string-or-comment))
-# --
-if (${1:true}) {
-   $0
-}

snippets/java-mode/ife

@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: ife
-# key: ife
-# uuid: ife
-# --
-if (${1:true}) {
-    `%`$2
-} else {
-    $0
-}

snippets/java-mode/import

@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: import
-# --
-import ${1:System.};
-$0

snippets/java-mode/interface

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: interface
-# key: interface
-# uuid: interface
-# --
-interface ${1:`(f-base buffer-file-name)`} {
-          $0
-}

snippets/java-mode/iterator

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: iterator
-# key: iterator
-# uuid: iterator
-# --
-public Iterator<${1:type}> iterator() {
-       $0
-}

snippets/java-mode/javadoc

@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: javadoc
-# key: doc
-# uuid: doc
-# --
-/**
- * $0
- *
- */

snippets/java-mode/main

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: main
-# key: main
-# uuid: main
-# --
-public static void main(String[] args) {
-       $0
-}

snippets/java-mode/method

@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: method
-# key: method
-# uuid: method
-# condition: (not (sp-point-in-string-or-comment))
-# --
-${1:void} ${2:name}($3) {
-    $0
-}

snippets/java-mode/method@

@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: @Override method
-# key: method@
-# uuid: method@
-# condition: (not (sp-point-in-string-or-comment))
-# --
-@Override ${1:public} ${2:void} ${3:methodName}($4) {
-          $0
-}

snippets/java-mode/new

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: new
-# key: new
-# uuid: new
-# --
-${1:Type} ${2:obj} = new ${3:$1}($4);$0

snippets/java-mode/paintComponent

@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: paintComponent (Swing)
-# key: paintComponent
-# uuid: paintComponent
-# condition: (not (sp-point-in-string-or-comment))
-# --
-@Override public void paintComponent(Graphics g) {
-          `%`$0
-}

snippets/java-mode/printf

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: printf
-# key: printf
-# uuid: printf
-# --
-System.out.printf("`%`$0%n");

snippets/java-mode/println

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: println
-# key: println
-# uuid: println
-# --
-System.out.println("`%`$0");

snippets/java-mode/private

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: private
-# key: pri
-# uuid: pri
-# --
-private $0

snippets/java-mode/protected

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: protected
-# key: pr
-# uuid: pr
-# --
-protected $0

snippets/java-mode/public

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: public
-# key: p
-# uuid: p
-# --
-public $0

snippets/java-mode/return

@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: return
-# key: ret
-# uuid: ret
-# condition: (not (sp-point-in-string-or-comment))
-# --
-return `%`$0;

snippets/java-mode/test

@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: test
-# key: test
-# uuid: test
-# --
-@Test
-public void test_${1:Case}() {
-       $0
-}

snippets/java-mode/testClass

@@ -1,13 +0,0 @@
-# -*- mode: snippet -*-
-# name: testClass
-# key: tc
-# uuid: tc
-# --
-import junit.framework.*;
-import junit.textui.*;
-
-public class Test${1:Class} extends TestCase {
-       protected void setUp() {
-                 $0
-       }
-}

snippets/java-mode/this

@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: this
-# key: .
-# uuid: .
-# --
-this.$0

snippets/java-mode/toString

@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: toString
-# key: toStr
-# uuid: toStr
-# --
-public String toString() {
-       $0
-}

snippets/java-mode/try

@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: try
-# key: try
-# uuid: try
-# condition: (not (sp-point-in-string-or-comment))
-# --
-try {
-    `%`$0
-} catch (${1:Throwable} e) {
-      ${2:System.out.println("Error " + e.getMessage());
-      e.printStackTrace();}
-}

snippets/java-mode/var

@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: variable declaration
-# key: var
-# uuid: var
-# condition: (not (sp-point-in-string-or-comment))
-# --
-${1:int} ${2:variable}