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

Merge features from LuaExtended, syntax and theme overhaul #15

Open
wants to merge 88 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
52ed918
Initial Commit
viluon May 22, 2016
3ac56de
Split if Snippets
viluon May 22, 2016
0ed25fb
Improve if Snippets and Indentation
viluon May 22, 2016
33d7bb1
Fix {} Indentation
viluon May 22, 2016
1fa1f11
Add Completions for the Standard Library
viluon May 22, 2016
5007267
Fix Completions for Library Constants
viluon May 22, 2016
b3494c9
Add elseif Snippets
viluon May 22, 2016
908e84d
Improve if Snippets
viluon May 22, 2016
01d26b7
Add Keyword Completions
viluon May 22, 2016
ebce718
Improve for ... in pairs() Snippet
viluon May 22, 2016
1799a46
Add $SELECTION Handling to Snippets
viluon May 22, 2016
64d3c43
Add Documented Function Snippet
viluon May 22, 2016
d36c3f8
Add Some of the C Operators as Snippets
viluon May 22, 2016
9fbc4ed
Ignore Inline Comments in ++ Snippet
viluon May 22, 2016
1815edd
Make Documented Function Follow LDoc Conventions
viluon May 23, 2016
0ae5eb8
Add a README
viluon May 23, 2016
b401cf3
Fix Completion Rules Scope
viluon May 23, 2016
d0186b6
Fix Scope
viluon May 23, 2016
69e60d6
License under MIT
viluon May 24, 2016
2c28540
Add a Linter Tutorial
viluon May 24, 2016
033e5d0
Fix Tutorial
viluon May 27, 2016
9711d47
Highlight Anonymous Functions
viluon May 28, 2016
a0d2716
Fix Function Call Highlighting
viluon May 29, 2016
d2ebc36
Update README
viluon May 29, 2016
0581388
Improve for Snippets
viluon May 29, 2016
7564538
Improve README
viluon May 30, 2016
f2d3c31
Add Optional `local` Keyword
viluon May 30, 2016
cf29b84
Fix Picture Positions
viluon May 30, 2016
93f224f
Fix Indentation
viluon May 30, 2016
81ce01a
More Screen Caps :sparkles:
viluon May 30, 2016
296ba89
New Tutorial
viluon Jun 2, 2016
dd02928
Fix Typo
viluon Jun 2, 2016
e6369b5
More C-like Snippets
viluon Jun 10, 2016
9217af8
Disable Completion for Initial Local Definition
viluon Jun 10, 2016
db98ea4
Update README
viluon Jun 15, 2016
3b2b500
Disable Snippets and Completions in Strings
viluon Jun 15, 2016
ae62136
Fix Indentation Regex
viluon Jun 15, 2016
d8b33ff
Add Package Control Links
viluon Jun 15, 2016
5520239
Fix Error Highlighting
viluon Jun 19, 2016
5359c8d
Improve README
viluon Jun 19, 2016
ea8eac8
More Badges :tada:
viluon Jun 19, 2016
70d03f8
Fix Badge Link
viluon Jun 19, 2016
4340bc7
Adjust Spacing
viluon Jun 19, 2016
4c3c59a
Fix Indentation
viluon Jun 21, 2016
9f85d1c
Fix Block String Function Call Highlighting
viluon Jun 21, 2016
d8902b1
Make dfun Support 0 Argument Functions
viluon Jun 29, 2016
4aab88c
Add Documented for Loop Snippets
viluon Jun 29, 2016
776e690
Rename Snippets
viluon Jun 29, 2016
a51e762
Fix Indent and Improve dfun
viluon Aug 11, 2016
f81c95d
Improve dfun
viluon Aug 12, 2016
41bfdd7
Fixed concatenated error highlighting. Resolves #7.
InternetUnexplorer Jan 2, 2017
7708a47
Added two new contexts, should fix #6.
InternetUnexplorer Jan 3, 2017
4c0832c
Merge pull request #9 from InternetUnexplorer/master
viluon Jan 3, 2017
ed48292
Improved how function_def contexts are implemented, fixes #10.
InternetUnexplorer Jan 21, 2017
af6a8a3
Merge pull request #12 from InternetUnexplorer/master
viluon Jan 22, 2017
c5b37c1
Small change to error_call regex, fixes #13.
InternetUnexplorer Jan 29, 2017
44671f4
Second attempt at modifying error_call regex, fixes #13.
InternetUnexplorer Feb 11, 2017
7f0e752
Added new error_call_start context, fixes #14.
InternetUnexplorer Mar 5, 2017
66fcf93
Merge pull request #14 from the awesome InternetUnexplorer/master
viluon Mar 5, 2017
3ff8610
Merge remote-tracking branch 'LuaExtended-viluon/master'
sparr Feb 10, 2020
c8d2c42
Merge and update LICENSE, remove irrelevant and redundant files
sparr Feb 10, 2020
4d84c69
Consolidate and expand comment syntax files
sparr Feb 10, 2020
3dcda31
Rename cancelCompletion file, add case for labels
sparr Feb 10, 2020
328c795
Update scope for keyword completions
sparr Feb 10, 2020
7138925
lowercase and rename menu file
sparr Feb 10, 2020
d63f3a7
Update messages, changelog, README.
sparr Feb 10, 2020
c48054e
Replace Neko250 URLs with pico-8 or sparr
sparr Feb 10, 2020
99f6df8
Replace tmTheme with sublime-color-scheme, change hex RGB to int/% HS…
sparr Feb 10, 2020
c9e7e6e
First of two commits replacing tmLanguage with sublime-syntax based o…
sparr Feb 10, 2020
45d1f43
PICO-8-ify LuaExtended sublime-syntax, add syntax, add colors
sparr Feb 10, 2020
ab2a16e
Delete duplicate snippets files
sparr Feb 10, 2020
42cc9bb
Merge Snippets and code/blocks folders
sparr Feb 10, 2020
de3db4a
Update api list for 0.1.12c
sparr Feb 10, 2020
f3ca7ec
Rename code directories
sparr Feb 10, 2020
dbfea5d
remove deprecated completions, clean up code
sparr Feb 10, 2020
8289a1b
Snippets cleanup, defaults changes, consolidation
sparr Feb 10, 2020
f7c8b92
Fix scope names
sparr Feb 10, 2020
187166a
Typo fix
sparr Feb 11, 2020
e56c625
Syntax and typo fix
sparr Feb 11, 2020
ca29432
Fix and improve snippet placeholders and replacements
sparr Feb 11, 2020
1c03249
Make palette color foregrounds less saturated
sparr Feb 11, 2020
acbef37
Fix syntax pattern and order bugs
sparr Feb 11, 2020
172c182
filename consistency
sparr Feb 11, 2020
88ce767
Resolve syntax quoting problem
sparr Feb 11, 2020
e4c8f44
Fix number matching problem in syntax
sparr Feb 11, 2020
2f99fe4
Clean up and clarify and update README
sparr Feb 11, 2020
82fd7a3
Bug fixes
sparr Feb 13, 2020
90adfa6
Correct Main menu filename
sparr Feb 19, 2020
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
1 change: 0 additions & 1 deletion .gitignore

This file was deleted.

Empty file removed .no-sublime-package
Empty file.
3 changes: 3 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
The MIT License (MIT)

Copyright (c) 2020 Clarence "Sparr" Risher
Copyright (c) 2016 Carlos Aguilar
Copyright (c) 2016 Andrew Kvapil

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
239 changes: 239 additions & 0 deletions PICO-8.sublime-color-scheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,239 @@
{
"name": "PICO-8",
"author": "Sparr and Overkill",
"variables":
{
// PICO-8 palette and UI colors
"pico8_background": "hsl(224, 48%, 22%)",
"pico8_palette_0_0_black": "hsl(0, 0%, 0%)",
"pico8_palette_1_1_darkblue": "hsl(216, 68%, 19%)",
"pico8_palette_2_2_darkred": "hsl(329, 55%, 32%)",
"pico8_palette_3_3_darkgreen": "hsl(156, 100%, 26%)",
"pico8_palette_4_4_brown": "hsl(14, 52%, 44%)",
"pico8_palette_5_5_darkgray": "hsl(30, 9%, 34%)",
"pico8_palette_6_6_lightgray": "hsl(228, 4%, 77%)",
"pico8_palette_7_7_white": "hsl(23, 100%, 95%)",
"pico8_palette_8_8_red": "hsl(342, 100%, 50%)",
"pico8_palette_9_9_orange": "hsl(38, 100%, 50%)",
"pico8_palette_A_10_yellow": "hsl(55, 100%, 58%)",
"pico8_palette_B_11_green": "hsl(134, 100%, 45%)",
"pico8_palette_C_12_blue": "hsl(203, 100%, 58%)",
"pico8_palette_D_13_purple": "hsl(261, 16%, 54%)",
"pico8_palette_E_14_pink": "hsl(338, 100%, 73%)",
"pico8_palette_F_15_peach": "hsl(24, 100%, 83%)",
// Palette colors shifted +/- 20% Value, half saturation
// Intended to be usd as foreground colors on palette backgrounds
"pico8_palette_0_0_valueshift": "hsl(0, 0%, 20%)",
"pico8_palette_1_1_valueshift": "hsl(216, 34%, 39%)",
"pico8_palette_2_2_valueshift": "hsl(329, 27%, 52%)",
"pico8_palette_3_3_valueshift": "hsl(156, 50%, 46%)",
"pico8_palette_4_4_valueshift": "hsl(14, 26%, 64%)",
"pico8_palette_5_5_valueshift": "hsl(30, 4%, 54%)",
"pico8_palette_6_6_valueshift": "hsl(228, 2%, 57%)",
"pico8_palette_7_7_valueshift": "hsl(23, 50%, 75%)",
"pico8_palette_8_8_valueshift": "hsl(342, 50%, 70%)",
"pico8_palette_9_9_valueshift": "hsl(38, 50%, 70%)",
"pico8_palette_A_10_valueshift": "hsl(55, 50%, 38%)",
"pico8_palette_B_11_valueshift": "hsl(134, 50%, 65%)",
"pico8_palette_C_12_valueshift": "hsl(203, 50%, 38%)",
"pico8_palette_D_13_valueshift": "hsl(261, 8%, 74%)",
"pico8_palette_E_14_valueshift": "hsl(338, 50%, 53%)",
"pico8_palette_F_15_valueshift": "hsl(24, 50%, 63%)",
// Other colors
"gray75": "hsl(0, 0%, 75%)",
"gray25": "hsl(0, 0%, 25%)",
},
"globals":
{
"foreground": "var(pico8_palette_6_6_lightgray)",
"background": "var(pico8_background)",
"caret": "var(pico8_palette_8_8_red)",
"invisibles": "var(gray75)",
"line_highlight": "var(gray25)",
"selection": "var(pico8_palette_A_10_yellow)"
},
"rules":
[
{
"name": "Source",
"scope": "source",
"background": "var(pico8_background)"
},
{
"name": "Comment",
"scope": "comment",
"foreground": "var(pico8_palette_D_13_purple)"
},
{
"name": "Keyword",
"scope": "keyword, storage",
"foreground": "var(pico8_palette_E_14_pink)"
},
{
"name": "Keyword operator",
"scope": "keyword.operator.logical",
"foreground": "var(pico8_palette_E_14_pink)"
},
{
"name": "Keyword operator",
"scope": "keyword.operator",
"foreground": "var(pico8_palette_7_7_white)"
},
{
"name": "Function (definition)",
"scope": "entity.name.function",
"foreground": "var(pico8_palette_6_6_lightgray)",
"font_style": "bold"
},
{
"name": "Class (definition)",
"scope": "entity.name",
"foreground": "var(pico8_palette_6_6_lightgray)"
},
{
"name": "Number",
"scope": "constant.numeric",
"foreground": "var(pico8_palette_C_12_blue)"
},
{
"name": "Variable",
"scope": "variable.language, variable.other",
"foreground": "var(pico8_palette_6_6_lightgray)",
"font_style": "bold"
},
{
"name": "Built-in constant",
"scope": "constant.language",
"foreground": "var(pico8_palette_C_12_blue)"
},
{
"name": "String",
"scope": "string",
"foreground": "var(pico8_palette_C_12_blue)"
},
{
"name": "Arrays brackets, Member dots, Method colons",
"scope": "punctuation.accessor",
"foreground": "var(pico8_palette_7_7_white)",
"font_style": "bold"
},
{
"name": "Parentheses",
"scope": "punctuation.section.parens",
"foreground": "var(pico8_palette_7_7_white)",
"font_style": "bold"
},
{
"name": "Braces",
"scope": "punctuation.section.braces",
"foreground": "var(pico8_palette_7_7_white)"
},
{
"name": "Support function",
"scope": "support.function",
"foreground": "var(pico8_palette_B_11_green)"
},
{
"name": "pico8 header \"doctype\"",
"scope": "source.p8 entity.name.tag.doctype",
"foreground": "var(pico8_palette_7_7_white)",
"font_style": "bold"
},
{
"name": "GFX digit 0",
"scope": "pico8.gfx.digit.0",
"foreground": "var(pico8_palette_0_0_valueshift)",
"background": "var(pico8_palette_0_0_black)"
},
{
"name": "GFX digit 1",
"scope": "pico8.gfx.digit.1",
"foreground": "var(pico8_palette_1_1_valueshift)",
"background": "var(pico8_palette_1_1_darkblue)"
},
{
"name": "GFX digit 2",
"scope": "pico8.gfx.digit.2",
"foreground": "var(pico8_palette_2_2_valueshift)",
"background": "var(pico8_palette_2_2_darkred)"
},
{
"name": "GFX digit 3",
"scope": "pico8.gfx.digit.3",
"foreground": "var(pico8_palette_3_3_valueshift)",
"background": "var(pico8_palette_3_3_darkgreen)"
},
{
"name": "GFX digit 4",
"scope": "pico8.gfx.digit.4",
"foreground": "var(pico8_palette_4_4_valueshift)",
"background": "var(pico8_palette_4_4_brown)"
},
{
"name": "GFX digit 5",
"scope": "pico8.gfx.digit.5",
"foreground": "var(pico8_palette_5_5_valueshift)",
"background": "var(pico8_palette_5_5_darkgray)"
},
{
"name": "GFX digit 6",
"scope": "pico8.gfx.digit.6",
"foreground": "var(pico8_palette_6_6_valueshift)",
"background": "var(pico8_palette_6_6_lightgray)"
},
{
"name": "GFX digit 7",
"scope": "pico8.gfx.digit.7",
"foreground": "var(pico8_palette_7_7_valueshift)",
"background": "var(pico8_palette_7_7_white)"
},
{
"name": "GFX digit 8",
"scope": "pico8.gfx.digit.8",
"foreground": "var(pico8_palette_8_8_valueshift)",
"background": "var(pico8_palette_8_8_red)"
},
{
"name": "GFX digit 9",
"scope": "pico8.gfx.digit.9",
"foreground": "var(pico8_palette_9_9_valueshift)",
"background": "var(pico8_palette_9_9_orange)"
},
{
"name": "GFX digit a",
"scope": "pico8.gfx.digit.a",
"foreground": "var(pico8_palette_A_10_valueshift)",
"background": "var(pico8_palette_A_10_yellow)"
},
{
"name": "GFX digit b",
"scope": "pico8.gfx.digit.b",
"foreground": "var(pico8_palette_B_11_valueshift)",
"background": "var(pico8_palette_B_11_green)"
},
{
"name": "GFX digit c",
"scope": "pico8.gfx.digit.c",
"foreground": "var(pico8_palette_C_12_valueshift)",
"background": "var(pico8_palette_C_12_blue)"
},
{
"name": "GFX digit d",
"scope": "pico8.gfx.digit.d",
"foreground": "var(pico8_palette_D_13_valueshift)",
"background": "var(pico8_palette_D_13_purple)"
},
{
"name": "GFX digit e",
"scope": "pico8.gfx.digit.e",
"foreground": "var(pico8_palette_E_14_valueshift)",
"background": "var(pico8_palette_E_14_pink)"
},
{
"name": "GFX digit f",
"scope": "pico8.gfx.digit.f",
"foreground": "var(pico8_palette_F_15_valueshift)",
"background": "var(pico8_palette_F_15_peach)"
}
]
}
4 changes: 2 additions & 2 deletions PICO-8.sublime-commands
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
}, {
"caption": "PICO-8: Browse API Reference",
"command": "open_url",
"args": { "url": "http://neko250.github.io/pico8-api" }
"args": { "url": "http://pico-8.github.io/pico8-api" }
}, {
"caption": "PICO-8: Download Font",
"command": "open_url",
"args": { "url": "https://raw.githubusercontent.com/Neko250/sublime-PICO-8/master/font/PICO-8.ttf" }
"args": { "url": "https://raw.githubusercontent.com/sparr/sublime-PICO-8/master/font/PICO-8.ttf" }
}, {
"caption": "Preferences: PICO-8 - Default",
"command": "open_file",
Expand Down
Loading