Skip to content

[pull] master from ajaxorg:master #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 7 commits into from
Mar 2, 2021
Merged

[pull] master from ajaxorg:master #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5397977
added Latte
dg Jan 28, 2021
ba0c391
fixes
dg Feb 4, 2021
ff8b08b
remove 2 csslint rules that only target ancient browsers
bogger33 Feb 10, 2021
dbba217
Fix vim's `dG` when performed over the whole range
bobrippling Feb 13, 2021
1622736
Merge pull request #4448 from bobrippling/fix-vim-dG
nightwing Mar 1, 2021
c59b39f
Merge pull request #4447 from bogger33/patch-1
nightwing Mar 1, 2021
fe61db4
Merge pull request #4432 from dg/pull-latte
nightwing Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions demo/kitchen-sink/docs/latte.latte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!doctype html>
<html>
<head>
<title>{$title}</title>
{*
comment
*}
</head>
<body>
<h1 n:inner-if=1 title=1>My Webpage</h1>

<ul n:if="count($navigation) > 0" id="navigation">
{foreach [a, b, 'x', 10] as $item}
<li><a href="{$item}">{test($item->caption)}</a></li>
{/foreach}
</ul>

{$variable}
{=$variable}
{XXXX::func($variable /* comment */)|filter}
{$variable?->obj|filter:10, abc, 'x$var', "x$var"|filter2}

{if} ... {/if true}

<script>
var a = {$a}, b = {'a': 1}, c = {'a': 1};
if (true) {
alert();
}
</script>

<style>
body { color: {$color} }
</style>
</body>
</html>
3 changes: 2 additions & 1 deletion lib/ace/ext/modelist.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ var supportedModes = {
Julia: ["jl"],
Kotlin: ["kt|kts"],
LaTeX: ["tex|latex|ltx|bib"],
Latte: ["latte"],
LESS: ["less"],
Liquid: ["liquid"],
Lisp: ["lisp"],
Expand Down Expand Up @@ -195,7 +196,7 @@ var supportedModes = {
Textile: ["textile"],
Toml: ["toml"],
TSX: ["tsx"],
Twig: ["latte|twig|swig"],
Twig: ["twig|swig"],
Typescript: ["ts|typescript|str"],
Vala: ["vala"],
VBScript: ["vbs|vb"],
Expand Down
3 changes: 2 additions & 1 deletion lib/ace/keyboard/vim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2921,7 +2921,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
}
var prevLineEnd = new Pos(anchor.line - 1, Number.MAX_VALUE);
var wasLastLine = cm.firstLine() == cm.lastLine();
if (head.line > cm.lastLine() && args.linewise && !wasLastLine) {
var isFirstLine = cm.firstLine() == anchor.line;
if (head.line > cm.lastLine() && args.linewise && !wasLastLine && !isFirstLine) {
cm.replaceRange('', prevLineEnd, head);
} else {
cm.replaceRange('', anchor, head);
Expand Down
6 changes: 6 additions & 0 deletions lib/ace/keyboard/vim_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,12 @@ testVim('dd_only_line', function(cm, vim, helpers) {
var register = helpers.getRegisterController().getRegister();
eq(expectedRegister, register.toString());
}, { value: "thisistheonlyline" });
testVim('cG', function(cm, vim, helpers) {
cm.setCursor(0, 0);
helpers.doKeys('c', 'G', 'inserted');
eq('inserted\n', cm.getValue());
helpers.assertCursorAt(0, 8);
}, { value: 'line1\nline2'});
// Yank commands should behave the exact same as d commands, expect that nothing
// gets deleted.
testVim('yw_repeat', function(cm, vim, helpers) {
Expand Down
309 changes: 309 additions & 0 deletions lib/ace/mode/_test/tokens_latte.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,309 @@
[[
"start",
["xml-pe.doctype.xml","<!"],
["xml-pe.doctype.xml","doctype"],
["text.whitespace.xml"," "],
["xml-pe.xml","html"],
["xml-pe.doctype.xml",">"]
],[
"start",
["meta.tag.punctuation.tag-open.xml","<"],
["meta.tag.tag-name.xml","html"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.xml","<"],
["meta.tag.tag-name.xml","head"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.xml","<"],
["meta.tag.tag-name.xml","title"],
["meta.tag.punctuation.tag-close.xml",">"],
["meta.tag.punctuation.tag-open.latte","{"],
["variable","$title"],
["meta.tag.punctuation.tag-close.latte","}"],
["meta.tag.punctuation.end-tag-open.xml","</"],
["meta.tag.tag-name.xml","title"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"comment.start.latte",
["text.xml"," "],
["comment.start.latte","{*"],
["comment"," "]
],[
"comment.start.latte",
["comment"," \tcomment"]
],[
"start",
["comment.end.latte"," *}"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.end-tag-open.xml","</"],
["meta.tag.tag-name.xml","head"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.xml","<"],
["meta.tag.tag-name.xml","body"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start",
["text.xml"," \t"],
["meta.tag.punctuation.tag-open.xml","<"],
["meta.tag.tag-name.xml","h1"],
["text.tag-whitespace.xml"," "],
["meta.attribute.latte","n:inner-if"],
["keyword.operator.attribute-equals.xml","="],
["constant.numeric","0"],
["meta.tag.punctuation.tag-close.xml",">"],
["entity.other.attribute-name.xml","My"],
["text.tag-whitespace.xml"," "],
["entity.other.attribute-name.xml","Webpage"],
["text","</"],
["entity.other.attribute-name.xml","h1"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start"
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.xml","<"],
["meta.tag.tag-name.xml","ul"],
["text.tag-whitespace.xml"," "],
["meta.attribute.latte","n:if"],
["keyword.operator.attribute-equals.xml","="],
["string.attribute-value.xml","\""],
["string.unquoted","count"],
["paren.lparen","("],
["variable","$navigation"],
["paren.rparen",")"],
["keyword.operator"," > "],
["constant.numeric","0"],
["string.attribute-value.xml","\""],
["text.tag-whitespace.xml"," "],
["entity.other.attribute-name.xml","id"],
["keyword.operator.attribute-equals.xml","="],
["string.attribute-value.xml","\"navigation\""],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.latte","{"],
["meta.tag.latte","foreach"],
["keyword.operator"," "],
["paren.lparen","["],
["string.unquoted","a"],
["keyword.operator",", "],
["string.unquoted","b"],
["keyword.operator",", "],
["string.start","'"],
["string","x"],
["string.end","'"],
["keyword.operator",", "],
["constant.numeric","10"],
["paren.rparen","]"],
["keyword.operator"," "],
["keyword.control","as"],
["keyword.operator"," "],
["variable","$item"],
["meta.tag.punctuation.tag-close.latte","}"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.xml","<"],
["meta.tag.tag-name.xml","li"],
["meta.tag.punctuation.tag-close.xml",">"],
["meta.tag.punctuation.tag-open.xml","<"],
["meta.tag.anchor.tag-name.xml","a"],
["text.tag-whitespace.xml"," "],
["entity.other.attribute-name.xml","href"],
["keyword.operator.attribute-equals.xml","="],
["string.attribute-value.xml","\""],
["meta.tag.punctuation.tag-open.latte","{"],
["variable","$item"],
["meta.tag.punctuation.tag-close.latte","}"],
["string.attribute-value.xml","\""],
["meta.tag.punctuation.tag-close.xml",">"],
["meta.tag.punctuation.tag-open.latte","{"],
["meta.tag.latte","test"],
["paren.lparen","("],
["variable","$item"],
["keyword.operator","->"],
["string.unquoted","caption"],
["paren.rparen",")"],
["meta.tag.punctuation.tag-close.latte","}"],
["meta.tag.punctuation.end-tag-open.xml","</"],
["meta.tag.anchor.tag-name.xml","a"],
["meta.tag.punctuation.tag-close.xml",">"],
["meta.tag.punctuation.end-tag-open.xml","</"],
["meta.tag.tag-name.xml","li"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.latte","{/"],
["meta.tag.latte","foreach"],
["meta.tag.punctuation.tag-close.latte","}"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.end-tag-open.xml","</"],
["meta.tag.tag-name.xml","ul"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start"
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.latte","{"],
["variable","$variable"],
["meta.tag.punctuation.tag-close.latte","}"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.latte","{"],
["meta.tag.latte","="],
["variable","$variable"],
["meta.tag.punctuation.tag-close.latte","}"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.latte","{"],
["variable","$variable"],
["keyword.operator","|"],
["string.unquoted","filter"],
["meta.tag.punctuation.tag-close.latte","}"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.latte","{"],
["variable","$variable"],
["keyword.operator","|"],
["string.unquoted","filter"],
["keyword.operator",":"],
["constant.numeric","10"],
["keyword.operator",","],
["constant.numeric","20"],
["keyword.operator","|"],
["string.unquoted","filter2"],
["meta.tag.punctuation.tag-close.latte","}"]
],[
"start"
],[
"js-start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.xml","<"],
["meta.tag.script.tag-name.xml","script"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"js-start",
["text","\t "],
["storage.type","var"],
["text"," "],
["identifier","a"],
["text"," "],
["keyword.operator","="],
["text"," "],
["meta.tag.punctuation.tag-open.latte","{"],
["variable","$a"],
["meta.tag.punctuation.tag-close.latte","}"],
["punctuation.operator",","],
["text"," "],
["identifier","b"],
["text"," "],
["keyword.operator","="],
["text"," "],
["paren.lparen","{"],
["string","'a'"],
["punctuation.operator",":"],
["text"," "],
["constant.numeric","1"],
["paren.rparen","}"],
["punctuation.operator",","],
["text"," "],
["identifier","c"],
["text"," "],
["keyword.operator","="],
["text"," "],
["paren.lparen","{"],
["string","'a'"],
["punctuation.operator",":"],
["text"," "],
["constant.numeric","1"],
["paren.rparen","}"],
["punctuation.operator",";"]
],[
"js-start",
["text","\t "],
["keyword","if"],
["text"," "],
["paren.lparen","("],
["constant.language.boolean","true"],
["paren.rparen",")"],
["text"," "],
["paren.lparen","{"]
],[
"js-start",
["text","\t \t"],
["support.function","alert"],
["paren.lparen","("],
["paren.rparen",")"],
["punctuation.operator",";"]
],[
"js-no_regex",
["text","\t "],
["paren.rparen","}"]
],[
"start",
["text"," "],
["meta.tag.punctuation.end-tag-open.xml","</"],
["meta.tag.script.tag-name.xml","script"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start"
],[
"css-start",
["text.xml"," "],
["meta.tag.punctuation.tag-open.xml","<"],
["meta.tag.style.tag-name.xml","style"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"css-start",
["text"," \t"],
["constant","body"],
["text"," "],
["paren.lparen","{"],
["text"," "],
["support.type","color"],
["punctuation.operator",":"],
["text"," "],
["meta.tag.punctuation.tag-open.latte","{"],
["variable","$color"],
["meta.tag.punctuation.tag-close.latte","}"],
["text"," "],
["paren.rparen","}"]
],[
"start",
["text"," "],
["meta.tag.punctuation.end-tag-open.xml","</"],
["meta.tag.style.tag-name.xml","style"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start",
["text.xml"," "],
["meta.tag.punctuation.end-tag-open.xml","</"],
["meta.tag.tag-name.xml","body"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start",
["meta.tag.punctuation.end-tag-open.xml","</"],
["meta.tag.tag-name.xml","html"],
["meta.tag.punctuation.tag-close.xml",">"]
],[
"start"
]]
Loading