Skip to content

Commit 6ad3b2a

Browse files
rx-devrx-dev
committedAug 9, 2023
feat: macros and more
new: macro support changed: comment blocks are way less strict
·
v1.0.1v0.1.0
1 parent f3eceb3 commit 6ad3b2a

15 files changed

+1072
-346
lines changed
 

‎.github/workflows/vscode.yml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: VSCode
2+
3+
on:
4+
pull_request:
5+
branches: [ main ]
6+
push:
7+
branches: [ main ]
8+
9+
jobs:
10+
ci:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
# ---------------------------------------------
15+
# ----- gather repo -----
16+
# ---------------------------------------------
17+
- uses: actions/checkout@v3
18+
with:
19+
fetch-depth: 0
20+
21+
- name: Use Node.js ${{ matrix.node-version }}
22+
uses: actions/setup-node@v3
23+
with:
24+
node-version: 20.x
25+
cache: npm
26+
27+
- name: Install VSCE and package
28+
run: |
29+
npm install -g @vscode/vsce
30+
vsce package
31+
32+
- name: Release
33+
uses: softprops/action-gh-release@v1

‎.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
.DS_Store
2+
3+
node_modules/
4+
*.vsix
5+
6+
.vscode/*
7+
!.vscode/launch.json

‎.vscode/launch.json

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// A launch configuration that launches the extension inside a new window
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
{
6+
"version": "0.2.0",
7+
"configurations": [
8+
{
9+
"name": "Extension",
10+
"type": "extensionHost",
11+
"request": "launch",
12+
"args": [
13+
"--extensionDevelopmentPath=${workspaceFolder}"
14+
]
15+
}
16+
]
17+
}

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Changelog
2+
3+
## v0.2.0
4+
5+
Refactor and additions to qualify for a `mcfunction` language
6+
7+
- Added explicit macro support
8+
- Loosened restrictions on special commenting
9+
- Fixed various bugs
10+
11+
## v0.1.0
12+
13+
Initial release for the `bolt` community with major support for multiline commands

‎language-configuration.json

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"comments": {
3+
// symbol used for single line comment. Remove this entry if your language does not support line comments
4+
"lineComment": "#",
5+
},
6+
// symbols used as brackets
7+
"brackets": [
8+
["{", "}"],
9+
["[", "]"],
10+
["(", ")"]
11+
],
12+
// symbols that are auto closed when typing
13+
"autoClosingPairs": [
14+
["{", "}"],
15+
["[", "]"],
16+
["(", ")"],
17+
["\"", "\""],
18+
["'", "'"]
19+
],
20+
// symbols that can be used to surround a selection
21+
"surroundingPairs": [
22+
["{", "}"],
23+
["[", "]"],
24+
["(", ")"],
25+
["\"", "\""],
26+
["'", "'"]
27+
]
28+
}

‎mcfunction.json

+540
Large diffs are not rendered by default.

‎mcfunction.yaml

+219-343
Large diffs are not rendered by default.

‎package-lock.json

+54
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"name": "mcfunction-tmlang",
3+
"displayName": "MCFunction Language",
4+
"description": "MCFunction",
5+
"author": "rx97",
6+
"private": true,
7+
"version": "0.2.0",
8+
"license": "MIT",
9+
"repository": {
10+
"type": "git",
11+
"url": "https://github.com/Microsoft/vscode-extension-samples"
12+
},
13+
"engines": {
14+
"vscode": "^1.81.0"
15+
},
16+
"categories": [
17+
"Programming Languages"
18+
],
19+
"contributes": {
20+
"languages": [
21+
{
22+
"id": "mcfunction",
23+
"aliases": [
24+
"mcfunction",
25+
"mcf",
26+
"MCF"
27+
],
28+
"extensions": [
29+
".mcfunction",
30+
".mcfunction"
31+
],
32+
"configuration": "./language-configuration.json"
33+
}
34+
],
35+
"grammars": [
36+
{
37+
"language": "mcfunction",
38+
"scopeName": "source.mcfunction",
39+
"path": "./mcfunction.json"
40+
}
41+
]
42+
},
43+
"devDependencies": {
44+
"js-yaml": "^4.1.0"
45+
}
46+
}

‎tests/everything.bolt ‎tests/bolt.mcfunction

File renamed without changes.

‎tests/jmc.mcfunction

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
class folder_one.folder_two
2+
{
3+
function folder_three.function_name() {
4+
say "Code example 1";
5+
say "Code example 2";
6+
}
7+
new file_type(folder_name.json_file_name) { // See JSON Files page for this feature
8+
JSON_CONTENT
9+
}
10+
}
11+
12+
folder_one.folder_two.folder_three.function_name();
13+
14+
if ($deathCount>5 ) {
15+
say "More than 5 death!";
16+
} else if ($deathCount matches 2..3 ) {
17+
say "Between 2 to 3 death!";
18+
} else if ($deathCount) {
19+
say "At least 1 death";
20+
}

‎tests/macros.mcfunction

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#> Macro, and other new examples
1+
#> Borrowed from slicedlime
22
# src: https://github.com/slicedlime/examples/
33

44
scoreboard players operation @a result \
@@ -8,9 +8,23 @@ scoreboard players operation @a result \
88
$$(command)
99

1010
# Concatenate $(string1) and $(string2), save that to $(path) in storage $(id)
11-
$data modify storage $(id) $(path) set value "$(string1)$(string2)"
11+
$data modify storage $(id) $(path) set value "with random $(string1) stuff $(string2)"
1212

1313
# Set the time to $(time)
1414
$time set $(time)
1515

16+
# this doesn't look perfect, but i can't really fix it
17+
$data modify \
18+
storage $(id) $(path) set \
19+
value "$(string1)$(string2)"
20+
21+
$data modify
22+
storage $(id) $(path) set
23+
value "$(string1)$(string2)"
24+
1625
random value 2..45
26+
27+
scoreboard players set #me not_comment 3 # hello world
28+
give @a #all_diamonds
29+
30+
execute summon marker run mud:register {command: "function a:target", setup: ""}

‎tests/mcbuild.mcfunction

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
dir a {
2+
function test {
3+
4+
}
5+
6+
function target {
7+
scoreboard players set #x v 1
8+
}
9+
10+
function setup {
11+
data merge storage a:test {}
12+
LOOP(1000,i){
13+
execute summon marker run mud:register {command:"function tests:a/target",setup:""}
14+
summon marker 0 0 0 {Tags:["a.i"]}
15+
}
16+
}
17+
18+
function cleanup {
19+
data remove storage a:test {}
20+
kill @e[type=marker]
21+
}
22+
}
23+
24+
dir b {
25+
26+
function test {
27+
execute @e[tag=b.test] run function tests:b/target
28+
}
29+
30+
function target {
31+
scoreboard players set #x v 1
32+
}
33+
34+
function setup {
35+
LOOP(1000,i) {
36+
summon marker 0 0 0 {Tags:["b.test"]}
37+
summon marker 0 0 0 {Tags:["b.i"]}
38+
}
39+
}
40+
41+
function cleanup {
42+
data remove storage b:test {}
43+
kill @e[type=marker]
44+
}
45+
}

‎tests/everything.mcfunction ‎tests/vanilla.mcfunction

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# @returns
1414
# $mypack.raycast.result return
1515
# The number of entities hit by the ray.
16+
# Caching handled by storage:location/over/here
1617

1718
function #mypack:hooks/raycast/begin
1819

@@ -160,4 +161,8 @@ give @s diamond_sword{display: {Name: '"My Custom Sword"'}}
160161
give @s minecraft:diamond_sword{display: {Name: '"My Custom Sword"'}}
161162

162163
execute if score @s foo < @s bar run say execute if score @s foo < @s bar run say
163-
execute if score @s foo < @s bar run say hello @e[tag=baz, sort=nearest, limit=1] how are you?
164+
execute if score @s foo < @s bar run say hello @e[tag=baz, sort=nearest, limit=1] how are you?
165+
166+
scoreboard players operation @a result \
167+
+= @e[type=marker,limit=1,tag=source] value
168+
$data modify storage $(id) $(path) set value "with random $(string1) stuff $(string2)"

‎vsc-extension-quickstart.md

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Welcome to your VS Code Extension
2+
3+
## What's in the folder
4+
5+
* This folder contains all of the files necessary for your extension.
6+
* `package.json` - this is the manifest file in which you declare your language support and define the location of the grammar file that has been copied into your extension.
7+
* `syntaxes/mcfunction.json` - this is the Text mate grammar file that is used for tokenization.
8+
* `language-configuration.json` - this is the language configuration, defining the tokens that are used for comments and brackets.
9+
10+
## Get up and running straight away
11+
12+
* Make sure the language configuration settings in `language-configuration.json` are accurate.
13+
* Press `F5` to open a new window with your extension loaded.
14+
* Create a new file with a file name suffix matching your language.
15+
* Verify that syntax highlighting works and that the language configuration settings are working.
16+
17+
## Make changes
18+
19+
* You can relaunch the extension from the debug toolbar after making changes to the files listed above.
20+
* You can also reload (`Ctrl+R` or `Cmd+R` on Mac) the VS Code window with your extension to load your changes.
21+
22+
## Add more language features
23+
24+
* To add features such as IntelliSense, hovers and validators check out the VS Code extenders documentation at https://code.visualstudio.com/docs
25+
26+
## Install your extension
27+
28+
* To start using your extension with Visual Studio Code copy it into the `<user home>/.vscode/extensions` folder and restart Code.
29+
* To share your extension with the world, read on https://code.visualstudio.com/docs about publishing an extension.

0 commit comments

Comments
 (0)
Please sign in to comment.