From c462c2bd3181c78289bfb95e89659255b888f127 Mon Sep 17 00:00:00 2001 From: E Date: Thu, 1 Oct 2015 13:59:52 -0700 Subject: [PATCH 1/6] add FreeMarker to languages.yml --- lib/linguist/languages.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 0de559ee..945479fb 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1036,6 +1036,18 @@ Frege: - .fr tm_scope: source.haskell ace_mode: haskell + +FreeMarker: + type: programming + color: "#0050b2" + group: Java + search_term: ftl + aliases: + - ftl + extensions: + - .ftl + tm_scope: text.html.ftl + ace_mode: ftl G-code: type: data From 1f1416a5f7ed42cf752cd67d13cf674a2b42397e Mon Sep 17 00:00:00 2001 From: edendramis Date: Thu, 15 Oct 2015 14:15:27 -0700 Subject: [PATCH 2/6] adding freemarker grammar --- .gitmodules | 3 +++ vendor/grammars/FreeMarker.tmbundle | 1 + 2 files changed, 4 insertions(+) create mode 160000 vendor/grammars/FreeMarker.tmbundle diff --git a/.gitmodules b/.gitmodules index 941dc61a..be2d7b30 100644 --- a/.gitmodules +++ b/.gitmodules @@ -680,3 +680,6 @@ [submodule "vendor/grammars/Stata.tmbundle"] path = vendor/grammars/Stata.tmbundle url = https://github.com/pschumm/Stata.tmbundle +[submodule "vendor/grammars/FreeMarker.tmbundle"] + path = vendor/grammars/FreeMarker.tmbundle + url = https://github.com/freemarker/FreeMarker.tmbundle diff --git a/vendor/grammars/FreeMarker.tmbundle b/vendor/grammars/FreeMarker.tmbundle new file mode 160000 index 00000000..6b7b880c --- /dev/null +++ b/vendor/grammars/FreeMarker.tmbundle @@ -0,0 +1 @@ +Subproject commit 6b7b880c533626b8e943ed686007c06771da3b42 From 11e3251efd66a3611c19ec664a46e022844d7bbf Mon Sep 17 00:00:00 2001 From: edendramis Date: Thu, 15 Oct 2015 14:43:02 -0700 Subject: [PATCH 3/6] adding samples --- samples/FreeMarker/example.ftl | 30 ++++++++++++++++++++++++++++++ samples/FreeMarker/layout.ftl | 12 ++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 samples/FreeMarker/example.ftl create mode 100644 samples/FreeMarker/layout.ftl diff --git a/samples/FreeMarker/example.ftl b/samples/FreeMarker/example.ftl new file mode 100644 index 00000000..c322b851 --- /dev/null +++ b/samples/FreeMarker/example.ftl @@ -0,0 +1,30 @@ +<#import "layout.ftl" as layout> + +<#assign results = [ + { + "title": "Example Result", + "description": "Lorem ipsum dolor sit amet, pede id pellentesque, sollicitudin turpis sed in sed sed, libero dictum." + } + ] /> + +<@layout.page title="FreeMarker Example"> + <#if results?size == 0> + There were no results. + <#else> +
    + <#list results as result> +
  • + ${result.title} +

    ${result.description}

    +
    • + +
+ + + <@currentTime /> + + + +<#macro currentTime> + ${.now?string.full} + diff --git a/samples/FreeMarker/layout.ftl b/samples/FreeMarker/layout.ftl new file mode 100644 index 00000000..cd7f554d --- /dev/null +++ b/samples/FreeMarker/layout.ftl @@ -0,0 +1,12 @@ +<#macro page title> + + + + + ${title} + + + <#nested /> + + + From 0f204767a943fb445694e450d365dfa3fd186a16 Mon Sep 17 00:00:00 2001 From: edendramis Date: Thu, 15 Oct 2015 14:48:20 -0700 Subject: [PATCH 4/6] updating examples --- samples/FreeMarker/example.ftl | 1 + samples/FreeMarker/layout.ftl | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/samples/FreeMarker/example.ftl b/samples/FreeMarker/example.ftl index c322b851..10a6ee95 100644 --- a/samples/FreeMarker/example.ftl +++ b/samples/FreeMarker/example.ftl @@ -21,6 +21,7 @@ + <#-- This is a FreeMarker comment --> <@currentTime /> diff --git a/samples/FreeMarker/layout.ftl b/samples/FreeMarker/layout.ftl index cd7f554d..18512dd6 100644 --- a/samples/FreeMarker/layout.ftl +++ b/samples/FreeMarker/layout.ftl @@ -1,12 +1,32 @@ +<#ftl strip_text=true /> + <#macro page title> - + - ${title} + <@metaTags /> <#nested /> + <@footer /> + + +<#--- + Default meta tags +--> +<#macro metaTags> + <#compress> + + + + + + + +<#macro footer> +

This page is using FreeMarker v${.version}

+ From 9e3cc01715e3349f56c645888a635b005a3e7239 Mon Sep 17 00:00:00 2001 From: edendramis Date: Fri, 16 Oct 2015 09:54:17 -0700 Subject: [PATCH 5/6] adding FreeMarker to grammars.yml --- grammars.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/grammars.yml b/grammars.yml index 4bd66f12..4eee0d23 100644 --- a/grammars.yml +++ b/grammars.yml @@ -42,6 +42,8 @@ vendor/grammars/Docker.tmbundle: - source.dockerfile vendor/grammars/Elm.tmLanguage: - source.elm +vendor/grammars/FreeMarker.tmbundle: +- text.html.ftl vendor/grammars/G-Code/: - source.LS - source.MCPOST From a55a60a161e37795f3490a9885836cefc0c4043b Mon Sep 17 00:00:00 2001 From: Evangelia Dendramis Date: Fri, 16 Oct 2015 18:19:53 -0700 Subject: [PATCH 6/6] removing group and search term --- lib/linguist/languages.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 03b50f2b..d036ac35 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1036,12 +1036,10 @@ Frege: - .fr tm_scope: source.haskell ace_mode: haskell - + FreeMarker: type: programming color: "#0050b2" - group: Java - search_term: ftl aliases: - ftl extensions: