Skip to content
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

Jump to bottom

temp: build until PR merge jinja highlighter #265

Closed
wants to merge 2 commits into from
Closed

temp: build until PR merge jinja highlighter #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ff218c
temp: build until PR medge jinja highlighter
blaggacao Sep 9, 2024
cceb11e
fix: variable scope use default token
blaggacao Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions ace-modules.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ declare module 'ace-builds/src-noconflict/mode-jade';
declare module 'ace-builds/src-noconflict/mode-java';
declare module 'ace-builds/src-noconflict/mode-javascript';
declare module 'ace-builds/src-noconflict/mode-jexl';
declare module 'ace-builds/src-noconflict/mode-jinja';
declare module 'ace-builds/src-noconflict/mode-json';
declare module 'ace-builds/src-noconflict/mode-json5';
declare module 'ace-builds/src-noconflict/mode-jsoniq';
Expand Down Expand Up @@ -346,6 +347,7 @@ declare module 'ace-builds/src-noconflict/snippets/jade';
declare module 'ace-builds/src-noconflict/snippets/java';
declare module 'ace-builds/src-noconflict/snippets/javascript';
declare module 'ace-builds/src-noconflict/snippets/jexl';
declare module 'ace-builds/src-noconflict/snippets/jinja';
declare module 'ace-builds/src-noconflict/snippets/json';
declare module 'ace-builds/src-noconflict/snippets/json5';
declare module 'ace-builds/src-noconflict/snippets/jsoniq';
Expand Down
2 changes: 2 additions & 0 deletions esm-resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ ace.config.setModuleLoader('ace/mode/jade', () => import('./src-noconflict/mode-
ace.config.setModuleLoader('ace/mode/java', () => import('./src-noconflict/mode-java.js'));
ace.config.setModuleLoader('ace/mode/javascript', () => import('./src-noconflict/mode-javascript.js'));
ace.config.setModuleLoader('ace/mode/jexl', () => import('./src-noconflict/mode-jexl.js'));
ace.config.setModuleLoader('ace/mode/jinja', () => import('./src-noconflict/mode-jinja.js'));
ace.config.setModuleLoader('ace/mode/json', () => import('./src-noconflict/mode-json.js'));
ace.config.setModuleLoader('ace/mode/json5', () => import('./src-noconflict/mode-json5.js'));
ace.config.setModuleLoader('ace/mode/jsoniq', () => import('./src-noconflict/mode-jsoniq.js'));
Expand Down Expand Up @@ -354,6 +355,7 @@ ace.config.setModuleLoader('ace/snippets/jade', () => import('./src-noconflict/s
ace.config.setModuleLoader('ace/snippets/java', () => import('./src-noconflict/snippets/java.js'));
ace.config.setModuleLoader('ace/snippets/javascript', () => import('./src-noconflict/snippets/javascript.js'));
ace.config.setModuleLoader('ace/snippets/jexl', () => import('./src-noconflict/snippets/jexl.js'));
ace.config.setModuleLoader('ace/snippets/jinja', () => import('./src-noconflict/snippets/jinja.js'));
ace.config.setModuleLoader('ace/snippets/json', () => import('./src-noconflict/snippets/json.js'));
ace.config.setModuleLoader('ace/snippets/json5', () => import('./src-noconflict/snippets/json5.js'));
ace.config.setModuleLoader('ace/snippets/jsoniq', () => import('./src-noconflict/snippets/jsoniq.js'));
Expand Down
2 changes: 1 addition & 1 deletion src-min-noconflict/mode-nunjucks.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/mode-nunjucks.js
View file
Open in desktop

Large diffs are not rendered by default.

162 changes: 81 additions & 81 deletions src-noconflict/ace.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-noconflict/ext-beautify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ace.define("ace/ext/beautify",["require","exports","module","ace/token_iterator"], function(require, exports, module){// [WIP]
ace.define("ace/ext/beautify",[], function(require, exports, module){// [WIP]
"use strict";
var TokenIterator = require("../token_iterator").TokenIterator;
function is(token, type) {
Expand Down
2 changes: 1 addition & 1 deletion src-noconflict/ext-code_lens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ace.define("ace/ext/code_lens",["require","exports","module","ace/line_widgets","ace/lib/event","ace/lib/lang","ace/lib/dom","ace/editor","ace/config"], function(require, exports, module){"use strict";
ace.define("ace/ext/code_lens",[], function(require, exports, module){"use strict";
var LineWidgets = require("../line_widgets").LineWidgets;
var event = require("../lib/event");
var lang = require("../lib/lang");
Expand Down
2 changes: 1 addition & 1 deletion src-noconflict/ext-command_bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ace.define("ace/ext/command_bar",["require","exports","module","ace/tooltip","ace/lib/event_emitter","ace/lib/lang","ace/lib/dom","ace/lib/oop","ace/lib/useragent"], function(require, exports, module){var __values = (this && this.__values) || function(o) {
ace.define("ace/ext/command_bar",[], function(require, exports, module){var __values = (this && this.__values) || function(o) {
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
if (m) return m.call(o);
if (o && typeof o.length === "number") return {
Expand Down
2 changes: 1 addition & 1 deletion src-noconflict/ext-elastic_tabstops_lite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ace.define("ace/ext/elastic_tabstops_lite",["require","exports","module","ace/editor","ace/config"], function(require, exports, module){"use strict";
ace.define("ace/ext/elastic_tabstops_lite",[], function(require, exports, module){"use strict";
var ElasticTabstopsLite = /** @class */ (function () {
function ElasticTabstopsLite(editor) {
this.$editor = editor;
Expand Down
4 changes: 2 additions & 2 deletions src-noconflict/ext-emmet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ace.define("ace/snippets",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/range_list","ace/keyboard/hash_handler","ace/tokenizer","ace/clipboard","ace/editor"], function(require, exports, module){"use strict";
ace.define("ace/snippets",[], function(require, exports, module){"use strict";
var dom = require("./lib/dom");
var oop = require("./lib/oop");
var EventEmitter = require("./lib/event_emitter").EventEmitter;
Expand Down Expand Up @@ -983,7 +983,7 @@ var Editor = require("./editor").Editor;

});

ace.define("ace/ext/emmet",["require","exports","module","ace/keyboard/hash_handler","ace/editor","ace/snippets","ace/range","ace/config","resources","resources","tabStops","resources","utils","actions"], function(require, exports, module){"use strict";
ace.define("ace/ext/emmet",[], function(require, exports, module){"use strict";
var HashHandler = require("../keyboard/hash_handler").HashHandler;
var Editor = require("../editor").Editor;
var snippetManager = require("../snippets").snippetManager;
Expand Down
2 changes: 1 addition & 1 deletion src-noconflict/ext-hardwrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ace.define("ace/ext/hardwrap",["require","exports","module","ace/range","ace/editor","ace/config"], function(require, exports, module){"use strict";
ace.define("ace/ext/hardwrap",[], function(require, exports, module){"use strict";
var Range = require("../range").Range;
function hardWrap(editor, options) {
var max = options.column || editor.getOption("printMarginColumn");
Expand Down
20 changes: 10 additions & 10 deletions src-noconflict/ext-inline_autocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ace.define("ace/snippets",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/range_list","ace/keyboard/hash_handler","ace/tokenizer","ace/clipboard","ace/editor"], function(require, exports, module){"use strict";
ace.define("ace/snippets",[], function(require, exports, module){"use strict";
var dom = require("./lib/dom");
var oop = require("./lib/oop");
var EventEmitter = require("./lib/event_emitter").EventEmitter;
Expand Down Expand Up @@ -983,7 +983,7 @@ var Editor = require("./editor").Editor;

});

ace.define("ace/autocomplete/inline_screenreader",["require","exports","module"], function(require, exports, module){"use strict";
ace.define("ace/autocomplete/inline_screenreader",[], function(require, exports, module){"use strict";
var AceInlineScreenReader = /** @class */ (function () {
function AceInlineScreenReader(editor) {
this.editor = editor;
Expand Down Expand Up @@ -1035,7 +1035,7 @@ exports.AceInlineScreenReader = AceInlineScreenReader;

});

ace.define("ace/autocomplete/inline",["require","exports","module","ace/snippets","ace/autocomplete/inline_screenreader"], function(require, exports, module){"use strict";
ace.define("ace/autocomplete/inline",[], function(require, exports, module){"use strict";
var snippetManager = require("../snippets").snippetManager;
var AceInlineScreenReader = require("./inline_screenreader").AceInlineScreenReader;
var AceInline = /** @class */ (function () {
Expand Down Expand Up @@ -1097,7 +1097,7 @@ exports.AceInline = AceInline;

});

ace.define("ace/autocomplete/popup",["require","exports","module","ace/virtual_renderer","ace/editor","ace/range","ace/lib/event","ace/lib/lang","ace/lib/dom","ace/config","ace/lib/useragent"], function(require, exports, module){"use strict";
ace.define("ace/autocomplete/popup",[], function(require, exports, module){"use strict";
var Renderer = require("../virtual_renderer").VirtualRenderer;
var Editor = require("../editor").Editor;
var Range = require("../range").Range;
Expand Down Expand Up @@ -1446,7 +1446,7 @@ exports.getAriaId = getAriaId;

});

ace.define("ace/autocomplete/util",["require","exports","module"], function(require, exports, module){"use strict";
ace.define("ace/autocomplete/util",[], function(require, exports, module){"use strict";
exports.parForEach = function (array, fn, callback) {
var completed = 0;
var arLength = array.length;
Expand Down Expand Up @@ -1510,7 +1510,7 @@ exports.triggerAutocomplete = function (editor, previousChar) {

});

ace.define("ace/autocomplete",["require","exports","module","ace/keyboard/hash_handler","ace/autocomplete/popup","ace/autocomplete/inline","ace/autocomplete/popup","ace/autocomplete/util","ace/lib/lang","ace/lib/dom","ace/snippets","ace/config","ace/lib/event","ace/lib/scroll"], function(require, exports, module){"use strict";
ace.define("ace/autocomplete",[], function(require, exports, module){"use strict";
var HashHandler = require("./keyboard/hash_handler").HashHandler;
var AcePopup = require("./autocomplete/popup").AcePopup;
var AceInline = require("./autocomplete/inline").AceInline;
Expand Down Expand Up @@ -2322,7 +2322,7 @@ exports.FilteredList = FilteredList;

});

ace.define("ace/ext/command_bar",["require","exports","module","ace/tooltip","ace/lib/event_emitter","ace/lib/lang","ace/lib/dom","ace/lib/oop","ace/lib/useragent"], function(require, exports, module){var __values = (this && this.__values) || function(o) {
ace.define("ace/ext/command_bar",[], function(require, exports, module){var __values = (this && this.__values) || function(o) {
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
if (m) return m.call(o);
if (o && typeof o.length === "number") return {
Expand Down Expand Up @@ -2775,7 +2775,7 @@ exports.BUTTON_CLASS_NAME = BUTTON_CLASS_NAME;

});

ace.define("ace/autocomplete/text_completer",["require","exports","module","ace/range"], function(require, exports, module){var Range = require("../range").Range;
ace.define("ace/autocomplete/text_completer",[], function(require, exports, module){var Range = require("../range").Range;
var splitRegex = /[^a-zA-Z_0-9\$\-\u00C0-\u1FFF\u2C00-\uD7FF\w]+/;
function getWordIndex(doc, pos) {
var textBefore = doc.getTextRange(Range.fromPoints({
Expand Down Expand Up @@ -2818,7 +2818,7 @@ exports.getCompletions = function (editor, session, pos, prefix, callback) {

});

ace.define("ace/ext/language_tools",["require","exports","module","ace/snippets","ace/autocomplete","ace/config","ace/lib/lang","ace/autocomplete/util","ace/autocomplete/text_completer","ace/editor","ace/config"], function(require, exports, module){"use strict";
ace.define("ace/ext/language_tools",[], function(require, exports, module){"use strict";
var snippetManager = require("../snippets").snippetManager;
var Autocomplete = require("../autocomplete").Autocomplete;
var config = require("../config");
Expand Down Expand Up @@ -3022,7 +3022,7 @@ require("../config").defineOptions(Editor.prototype, "editor", {

});

ace.define("ace/ext/inline_autocomplete",["require","exports","module","ace/keyboard/hash_handler","ace/autocomplete/inline","ace/autocomplete","ace/autocomplete","ace/editor","ace/autocomplete/util","ace/lib/dom","ace/lib/lang","ace/ext/command_bar","ace/ext/command_bar","ace/ext/language_tools","ace/ext/language_tools","ace/ext/language_tools","ace/config"], function(require, exports, module){"use strict";
ace.define("ace/ext/inline_autocomplete",[], function(require, exports, module){"use strict";
var HashHandler = require("../keyboard/hash_handler").HashHandler;
var AceInline = require("../autocomplete/inline").AceInline;
var FilteredList = require("../autocomplete").FilteredList;
Expand Down
8 changes: 4 additions & 4 deletions src-noconflict/ext-keybinding_menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ace.define("ace/ext/menu_tools/settings_menu.css",["require","exports","module"], function(require, exports, module){module.exports = "#ace_settingsmenu, #kbshortcutmenu {\n background-color: #F7F7F7;\n color: black;\n box-shadow: -5px 4px 5px rgba(126, 126, 126, 0.55);\n padding: 1em 0.5em 2em 1em;\n overflow: auto;\n position: absolute;\n margin: 0;\n bottom: 0;\n right: 0;\n top: 0;\n z-index: 9991;\n cursor: default;\n}\n\n.ace_dark #ace_settingsmenu, .ace_dark #kbshortcutmenu {\n box-shadow: -20px 10px 25px rgba(126, 126, 126, 0.25);\n background-color: rgba(255, 255, 255, 0.6);\n color: black;\n}\n\n.ace_optionsMenuEntry:hover {\n background-color: rgba(100, 100, 100, 0.1);\n transition: all 0.3s\n}\n\n.ace_closeButton {\n background: rgba(245, 146, 146, 0.5);\n border: 1px solid #F48A8A;\n border-radius: 50%;\n padding: 7px;\n position: absolute;\n right: -8px;\n top: -8px;\n z-index: 100000;\n}\n.ace_closeButton{\n background: rgba(245, 146, 146, 0.9);\n}\n.ace_optionsMenuKey {\n color: darkslateblue;\n font-weight: bold;\n}\n.ace_optionsMenuCommand {\n color: darkcyan;\n font-weight: normal;\n}\n.ace_optionsMenuEntry input, .ace_optionsMenuEntry button {\n vertical-align: middle;\n}\n\n.ace_optionsMenuEntry button[ace_selected_button=true] {\n background: #e7e7e7;\n box-shadow: 1px 0px 2px 0px #adadad inset;\n border-color: #adadad;\n}\n.ace_optionsMenuEntry button {\n background: white;\n border: 1px solid lightgray;\n margin: 0px;\n}\n.ace_optionsMenuEntry button:hover{\n background: #f0f0f0;\n}";
ace.define("ace/ext/menu_tools/settings_menu.css",[], function(require, exports, module){module.exports = "#ace_settingsmenu, #kbshortcutmenu {\n background-color: #F7F7F7;\n color: black;\n box-shadow: -5px 4px 5px rgba(126, 126, 126, 0.55);\n padding: 1em 0.5em 2em 1em;\n overflow: auto;\n position: absolute;\n margin: 0;\n bottom: 0;\n right: 0;\n top: 0;\n z-index: 9991;\n cursor: default;\n}\n\n.ace_dark #ace_settingsmenu, .ace_dark #kbshortcutmenu {\n box-shadow: -20px 10px 25px rgba(126, 126, 126, 0.25);\n background-color: rgba(255, 255, 255, 0.6);\n color: black;\n}\n\n.ace_optionsMenuEntry:hover {\n background-color: rgba(100, 100, 100, 0.1);\n transition: all 0.3s\n}\n\n.ace_closeButton {\n background: rgba(245, 146, 146, 0.5);\n border: 1px solid #F48A8A;\n border-radius: 50%;\n padding: 7px;\n position: absolute;\n right: -8px;\n top: -8px;\n z-index: 100000;\n}\n.ace_closeButton{\n background: rgba(245, 146, 146, 0.9);\n}\n.ace_optionsMenuKey {\n color: darkslateblue;\n font-weight: bold;\n}\n.ace_optionsMenuCommand {\n color: darkcyan;\n font-weight: normal;\n}\n.ace_optionsMenuEntry input, .ace_optionsMenuEntry button {\n vertical-align: middle;\n}\n\n.ace_optionsMenuEntry button[ace_selected_button=true] {\n background: #e7e7e7;\n box-shadow: 1px 0px 2px 0px #adadad inset;\n border-color: #adadad;\n}\n.ace_optionsMenuEntry button {\n background: white;\n border: 1px solid lightgray;\n margin: 0px;\n}\n.ace_optionsMenuEntry button:hover{\n background: #f0f0f0;\n}";

});

ace.define("ace/ext/menu_tools/overlay_page",["require","exports","module","ace/lib/dom","ace/ext/menu_tools/settings_menu.css"], function(require, exports, module){/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
ace.define("ace/ext/menu_tools/overlay_page",[], function(require, exports, module){/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
'use strict';
var dom = require("../../lib/dom");
var cssText = require("./settings_menu.css");
Expand Down Expand Up @@ -59,7 +59,7 @@ module.exports.overlayPage = function overlayPage(editor, contentElement, callba

});

ace.define("ace/ext/menu_tools/get_editor_keyboard_shortcuts",["require","exports","module","ace/lib/keys"], function(require, exports, module){/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
ace.define("ace/ext/menu_tools/get_editor_keyboard_shortcuts",[], function(require, exports, module){/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
"use strict"; var keys = require("../../lib/keys");
module.exports.getEditorKeybordShortcuts = function (editor) {
var KEY_MODS = keys.KEY_MODS;
Expand Down Expand Up @@ -90,7 +90,7 @@ module.exports.getEditorKeybordShortcuts = function (editor) {

});

ace.define("ace/ext/keybinding_menu",["require","exports","module","ace/editor","ace/ext/menu_tools/overlay_page","ace/ext/menu_tools/get_editor_keyboard_shortcuts"], function(require, exports, module){/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
ace.define("ace/ext/keybinding_menu",[], function(require, exports, module){/*jslint indent: 4, maxerr: 50, white: true, browser: true, vars: true*/
"use strict";
var Editor = require("../editor").Editor;
function showKeyboardShortcuts(editor) {
Expand Down
Loading