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.

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

Add GameMaker Language support #1551

Merged
merged 31 commits into from
Sep 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
33269cd
Add GameMaker Language support.
LiarOnce Sep 9, 2018
35e4e81
Add example for gml.
LiarOnce Sep 9, 2018
f47fa57
Escape the < using &lt; to make it valid markup.
LiarOnce Sep 9, 2018
4f1baaf
Remove lookbehind.
LiarOnce Sep 9, 2018
9ed3804
Remove "\\$[0-9]*"
LiarOnce Sep 9, 2018
a05bc9e
Change to "globalvar", "var", "enum".
LiarOnce Sep 9, 2018
151f2cd
Delete minified file.
LiarOnce Sep 9, 2018
dba904b
Use single quotes.
LiarOnce Sep 9, 2018
0a3e68e
Modified to components.json (which can be misleading here)
LiarOnce Sep 9, 2018
76a44e0
Add into components.json
LiarOnce Sep 9, 2018
db0e7e7
Delete README.md
LiarOnce Sep 9, 2018
9faa366
Fix the type of error.
LiarOnce Sep 9, 2018
9750293
Revert "Delete README.md"
LiarOnce Sep 9, 2018
5ef4036
Revert "Modified to components.json (which can be misleading here)"
LiarOnce Sep 9, 2018
2f0d24f
Use non-capturing group for constants.
LiarOnce Sep 10, 2018
9c17577
Use non-capturing group for variables.
LiarOnce Sep 10, 2018
dff0eb6
Completely.( No.4 )
LiarOnce Sep 10, 2018
a964c86
Delete components.js
LiarOnce Sep 10, 2018
bf17868
Change to "\w"
LiarOnce Sep 10, 2018
53ad572
Try to reach No.2
LiarOnce Sep 10, 2018
6a6a4af
Extend c-like and add full name.
LiarOnce Sep 11, 2018
81ecec1
Add a semicolon.
LiarOnce Sep 11, 2018
03dc8b1
Cancel extend c-like.
LiarOnce Sep 11, 2018
052cdac
Revert "Cancel extend c-like."
LiarOnce Sep 12, 2018
9258b86
Revert c-like.(now it works)
LiarOnce Sep 12, 2018
1cd7c9d
Move var and enum into the keyword pattern, etc.
LiarOnce Sep 13, 2018
d88c6e9
Add alias.
LiarOnce Sep 13, 2018
27da597
Change to line 1.
LiarOnce Sep 14, 2018
9f58a50
Change alias.
LiarOnce Sep 14, 2018
189d818
Run gulp.
LiarOnce Sep 15, 2018
573be52
Merge branch 'master' of https://github.com/LiarOnce/prism
LiarOnce Sep 15, 2018
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
2 changes: 1 addition & 1 deletion components.js

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,12 @@
"require": "clike",
"owner": "Golmote"
},
"gml": {
"title": "GameMaker Language",
"alias": "gamemakerlanguage",
"require": "clike",
"owner": "LiarOnce"
},
"go": {
"title": "Go",
"require": "clike",
Expand Down
7 changes: 7 additions & 0 deletions components/prism-gml.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/prism-gml.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions examples/prism-gml.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<h2>Comments</h2>
<pre><code>// This is a comment
/* This is a comment
on multiple lines */</code></pre>

<h2>Functions</h2>
<pre><code>variable_instance_set(_inst,_var_name,_start+_change);</code></pre>

<h2>Full example</h2>
<pre><code>if(instance_exists(_inst) || _inst==global){
if(_delay<=0){
_time+=1;
if(_time&lt;_duration){
event_user(0);
}else{
if(_inst!=global){
variable_instance_set(_inst,_var_name,_start+_change);
}else{
variable_global_set(_var_name,_start+_change);
}
instance_destroy();
}
}else{
_delay-=1;
}
}else{
instance_destroy();
}
</code></pre>
2 changes: 1 addition & 1 deletion plugins/autoloader/prism-autoloader.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}

// The dependencies map is built automatically with gulp
var lang_dependencies = /*languages_placeholder[*/{"javascript":"clike","actionscript":"javascript","arduino":"cpp","aspnet":["markup","csharp"],"bison":"c","c":"clike","csharp":"clike","cpp":"c","coffeescript":"javascript","crystal":"ruby","css-extras":"css","d":"clike","dart":"clike","django":"markup","erb":["ruby","markup-templating"],"fsharp":"clike","flow":"javascript","glsl":"clike","go":"clike","groovy":"clike","haml":"ruby","handlebars":"markup-templating","haxe":"clike","java":"clike","jolie":"clike","kotlin":"clike","less":"css","markdown":"markup","markup-templating":"markup","n4js":"javascript","nginx":"clike","objectivec":"c","opencl":"cpp","parser":"markup","php":["clike","markup-templating"],"php-extras":"php","plsql":"sql","processing":"clike","protobuf":"clike","pug":"javascript","qore":"clike","jsx":["markup","javascript"],"tsx":["jsx","typescript"],"reason":"clike","ruby":"clike","sass":"css","scss":"css","scala":"java","smarty":"markup-templating","soy":"markup-templating","swift":"clike","tap":"yaml","textile":"markup","tt2":["clike","markup-templating"],"twig":"markup","typescript":"javascript","vbnet":"basic","velocity":"markup","wiki":"markup","xeora":"markup","xquery":"markup"}/*]*/;
var lang_dependencies = /*languages_placeholder[*/{"javascript":"clike","actionscript":"javascript","arduino":"cpp","aspnet":["markup","csharp"],"bison":"c","c":"clike","csharp":"clike","cpp":"c","coffeescript":"javascript","crystal":"ruby","css-extras":"css","d":"clike","dart":"clike","django":"markup","erb":["ruby","markup-templating"],"fsharp":"clike","flow":"javascript","glsl":"clike","gml":"clike","go":"clike","groovy":"clike","haml":"ruby","handlebars":"markup-templating","haxe":"clike","java":"clike","jolie":"clike","kotlin":"clike","less":"css","markdown":"markup","markup-templating":"markup","n4js":"javascript","nginx":"clike","objectivec":"c","opencl":"cpp","parser":"markup","php":["clike","markup-templating"],"php-extras":"php","plsql":"sql","processing":"clike","protobuf":"clike","pug":"javascript","qore":"clike","jsx":["markup","javascript"],"tsx":["jsx","typescript"],"reason":"clike","ruby":"clike","sass":"css","scss":"css","scala":"java","smarty":"markup-templating","soy":"markup-templating","swift":"clike","tap":"yaml","textile":"markup","tt2":["clike","markup-templating"],"twig":"markup","typescript":"javascript","vbnet":"basic","velocity":"markup","wiki":"markup","xeora":"markup","xquery":"markup"}/*]*/;

var lang_data = {};

Expand Down
Loading