Skip to content

Commit afd1806

Browse files
andrewnesterandrewnester
committed
Revert "package 12.05.22"
This reverts commit 448ae8c.
1 parent 53c656b commit afd1806

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+188
-4628
lines changed

‎CHANGELOG.md

Lines changed: 0 additions & 540 deletions
This file was deleted.

‎ace-modules.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ declare module 'ace-builds/src-noconflict/mode-assembly_x86';
4141
declare module 'ace-builds/src-noconflict/mode-autohotkey';
4242
declare module 'ace-builds/src-noconflict/mode-batchfile';
4343
declare module 'ace-builds/src-noconflict/mode-c9search';
44-
declare module 'ace-builds/src-noconflict/mode-c_cpp';
4544
declare module 'ace-builds/src-noconflict/mode-cirru';
4645
declare module 'ace-builds/src-noconflict/mode-clojure';
4746
declare module 'ace-builds/src-noconflict/mode-cobol';
@@ -55,6 +54,7 @@ declare module 'ace-builds/src-noconflict/mode-csound_score';
5554
declare module 'ace-builds/src-noconflict/mode-csp';
5655
declare module 'ace-builds/src-noconflict/mode-css';
5756
declare module 'ace-builds/src-noconflict/mode-curly';
57+
declare module 'ace-builds/src-noconflict/mode-c_cpp';
5858
declare module 'ace-builds/src-noconflict/mode-d';
5959
declare module 'ace-builds/src-noconflict/mode-dart';
6060
declare module 'ace-builds/src-noconflict/mode-diff';
@@ -222,8 +222,8 @@ declare module 'ace-builds/src-noconflict/theme-kr_theme';
222222
declare module 'ace-builds/src-noconflict/theme-kuroir';
223223
declare module 'ace-builds/src-noconflict/theme-merbivore';
224224
declare module 'ace-builds/src-noconflict/theme-merbivore_soft';
225-
declare module 'ace-builds/src-noconflict/theme-mono_industrial';
226225
declare module 'ace-builds/src-noconflict/theme-monokai';
226+
declare module 'ace-builds/src-noconflict/theme-mono_industrial';
227227
declare module 'ace-builds/src-noconflict/theme-nord_dark';
228228
declare module 'ace-builds/src-noconflict/theme-one_dark';
229229
declare module 'ace-builds/src-noconflict/theme-pastel_on_dark';
@@ -255,7 +255,6 @@ declare module 'ace-builds/src-noconflict/snippets/assembly_x86';
255255
declare module 'ace-builds/src-noconflict/snippets/autohotkey';
256256
declare module 'ace-builds/src-noconflict/snippets/batchfile';
257257
declare module 'ace-builds/src-noconflict/snippets/c9search';
258-
declare module 'ace-builds/src-noconflict/snippets/c_cpp';
259258
declare module 'ace-builds/src-noconflict/snippets/cirru';
260259
declare module 'ace-builds/src-noconflict/snippets/clojure';
261260
declare module 'ace-builds/src-noconflict/snippets/cobol';
@@ -269,6 +268,7 @@ declare module 'ace-builds/src-noconflict/snippets/csound_score';
269268
declare module 'ace-builds/src-noconflict/snippets/csp';
270269
declare module 'ace-builds/src-noconflict/snippets/css';
271270
declare module 'ace-builds/src-noconflict/snippets/curly';
271+
declare module 'ace-builds/src-noconflict/snippets/c_cpp';
272272
declare module 'ace-builds/src-noconflict/snippets/d';
273273
declare module 'ace-builds/src-noconflict/snippets/dart';
274274
declare module 'ace-builds/src-noconflict/snippets/diff';

‎ace.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ export namespace Ace {
757757
setStyle(style: string): void;
758758
unsetStyle(style: string): void;
759759
getFontSize(): string;
760-
setFontSize(size: number): void;
760+
setFontSize(size: string): void;
761761
focus(): void;
762762
isFocused(): boolean;
763763
blur(): void;

‎demo/kitchen-sink/demo.js

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,7 +1780,6 @@ var supportedModes = {
17801780
HTML_Ruby: ["erb|rhtml|html.erb"],
17811781
INI: ["ini|conf|cfg|prefs"],
17821782
Io: ["io"],
1783-
Ion: ["ion"],
17841783
Jack: ["jack"],
17851784
Jade: ["jade|pug"],
17861785
Java: ["java"],
@@ -1822,12 +1821,11 @@ var supportedModes = {
18221821
Nunjucks: ["nunjucks|nunjs|nj|njk"],
18231822
ObjectiveC: ["m|mm"],
18241823
OCaml: ["ml|mli"],
1825-
PartiQL: ["partiql|pql"],
18261824
Pascal: ["pas|p"],
18271825
Perl: ["pl|pm"],
18281826
pgSQL: ["pgsql"],
1829-
PHP_Laravel_blade: ["blade.php"],
18301827
PHP: ["php|inc|phtml|shtml|php3|php4|php5|phps|phpt|aw|ctp|module"],
1828+
PHP_Laravel_blade: ["blade.php"],
18311829
Pig: ["pig"],
18321830
Powershell: ["ps1"],
18331831
Praat: ["praat|praatscript|psc|proc"],
@@ -1847,7 +1845,6 @@ var supportedModes = {
18471845
RST: ["rst"],
18481846
Ruby: ["rb|ru|gemspec|rake|^Guardfile|^Rakefile|^Gemfile"],
18491847
Rust: ["rs"],
1850-
SaC: ["sac"],
18511848
SASS: ["sass"],
18521849
SCAD: ["scad"],
18531850
Scala: ["scala|sbt"],
@@ -6834,15 +6831,6 @@ var keyWordCompleter = {
68346831
}
68356832
};
68366833

6837-
var transformSnippetTooltip = function(str) {
6838-
var record = {};
6839-
return str.replace(/\${(\d+)(:(.*?))?}/g, function(_, p1, p2, p3) {
6840-
return (record[p1] = p3 || '');
6841-
}).replace(/\$(\d+?)/g, function (_, p1) {
6842-
return record[p1];
6843-
});
6844-
};
6845-
68466834
var snippetCompleter = {
68476835
getCompletions: function(editor, session, pos, prefix, callback) {
68486836
var scopes = [];
@@ -6875,7 +6863,7 @@ var snippetCompleter = {
68756863
if (item.type == "snippet" && !item.docHTML) {
68766864
item.docHTML = [
68776865
"<b>", lang.escapeHTML(item.caption), "</b>", "<hr></hr>",
6878-
lang.escapeHTML(transformSnippetTooltip(item.snippet))
6866+
lang.escapeHTML(item.snippet)
68796867
].join("");
68806868
}
68816869
}
@@ -7006,17 +6994,12 @@ function is(token, type) {
70066994
exports.singletonTags = ["area", "base", "br", "col", "command", "embed", "hr", "html", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr"];
70076995
exports.blockTags = ["article", "aside", "blockquote", "body", "div", "dl", "fieldset", "footer", "form", "head", "header", "html", "nav", "ol", "p", "script", "section", "style", "table", "tbody", "tfoot", "thead", "ul"];
70086996

7009-
exports.formatOptions = {
7010-
lineBreaksAfterCommasInCurlyBlock: true
7011-
};
7012-
70136997
exports.beautify = function(session) {
70146998
var iterator = new TokenIterator(session, 0, 0);
70156999
var token = iterator.getCurrentToken();
70167000
var tabString = session.getTabString();
70177001
var singletonTags = exports.singletonTags;
70187002
var blockTags = exports.blockTags;
7019-
var formatOptions = exports.formatOptions || {};
70207003
var nextToken;
70217004
var breakBefore = false;
70227005
var spaceBefore = false;
@@ -7198,7 +7181,7 @@ exports.beautify = function(session) {
71987181
} else if (token.type === "punctuation.operator" && value.match(/^(:|,)$/)) {
71997182
trimCode();
72007183
trimNext();
7201-
if (value.match(/^(,)$/) && curlyDepth>0 && roundDepth===0 && formatOptions.lineBreaksAfterCommasInCurlyBlock) {
7184+
if (value.match(/^(,)$/) && curlyDepth>0 && roundDepth===0) {
72027185
rowsToAdd++;
72037186
} else {
72047187
spaceAfter = true;
@@ -7305,18 +7288,14 @@ exports.beautify = function(session) {
73057288
else
73067289
rowsToAdd = 1;
73077290
}
7308-
if (nextToken && singletonTags.indexOf(nextToken.value) === -1) {
7309-
if (is(token, "tag-open") && value === "</") {
7310-
depth--;
7311-
} else if (is(token, "tag-open") && value === "<") {
7312-
depth++;
7313-
} else if (is(token, "tag-close") && value === "/>"){
7314-
depth--;
7315-
}
7316-
}
7317-
7318-
if (is(token, "tag-name")) {
7291+
if (is(token, "tag-open") && value === "</") {
7292+
depth--;
7293+
} else if (is(token, "tag-open") && value === "<" && singletonTags.indexOf(nextToken.value) === -1) {
7294+
depth++;
7295+
} else if (is(token, "tag-name")) {
73197296
tagName = value;
7297+
} else if (is(token, "tag-close") && value === "/>" && singletonTags.indexOf(tagName) === -1){
7298+
depth--;
73207299
}
73217300

73227301
row = curRow;

‎demo/kitchen-sink/docs/ion.ion

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎demo/kitchen-sink/docs/partiql.partiql

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎demo/kitchen-sink/docs/php_laravel_blade.blade.php

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,4 @@
6565
@yield('content')
6666
</div>
6767
</body>
68-
</html>
69-
70-
71-
{{-- comment --}}
72-
73-
@if (
74-
{{-- comment --}}
75-
/*block comment*/
76-
#another comment
77-
$user->type == 1
78-
// c comment
79-
/* comment*/
80-
)
81-
# not a comment <div id="#//x"></div>
82-
@endif
68+
</html>

‎demo/kitchen-sink/docs/sac.sac

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎kitchen-sink.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<meta name="author" content="Fabian Jakobs">
99
<!--
1010
Ace
11-
version 1.5.0
11+
version 1.4.14
1212
commit
1313
-->
1414

0 commit comments

Comments
 (0)