Skip to content

Commit

Permalink
Merge pull request #2 from 1Axen/plugin-auto-completion
Browse files Browse the repository at this point in the history
Merge new plugin improvements
  • Loading branch information
1Axen authored Feb 27, 2024
2 parents 11109de + dd46a38 commit 4fe38fe
Show file tree
Hide file tree
Showing 29 changed files with 10,283 additions and 770 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"luau-lsp.require.mode": "relativeToFile",
"luau-lsp.require.directoryAliases": {
"@lune/": "~/.lune/.typedefs/0.7.11/"
}
},
"luau-lsp.sourcemap.rojoProjectFile": "default.project.json"
}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ Head over to the [installation](https://github.com/1Axen/Blink/blob/main/docs/In
# Credits
Credits to [Zap](https://zap.redblox.dev/) for the range and array syntax
Credits to [ArvidSilverlock](https://github.com/ArvidSilverlock) for the float16 implementation
Studio plugin auto completion icons are sourced from [Microsoft](https://github.com/microsoft/vscode-icons) and are under the [CC BY 4.0](https://github.com/microsoft/vscode-icons/blob/main/LICENSE) license.
<a href="https://www.flaticon.com/free-icons/speed" title="speed icons">Speed icons created by alkhalifi design - Flaticon</a>
2 changes: 1 addition & 1 deletion build/.darklua.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{
"identifier": "VERSION",
"rule": "inject_global_value",
"value": "0.6.4"
"value": "0.7.0"
}
]
}
4 changes: 2 additions & 2 deletions build/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ echo Zipping files
echo Packaging plugin
cd ../plugin
copy "..\build\.darklua.json" ".\.darklua.json"
darklua process "./src/init.luau" "./bundle/init.server.lua"
rojo build --output "../release/Plugin-%VERSION%.rbxmx"
darklua process "./src/init.server.luau" "./bundle/init.server.lua"
rojo build bundle.project.json --output "../release/Plugin-%VERSION%.rbxmx"

cd ../build

Expand Down
6 changes: 6 additions & 0 deletions default.project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "Blink",
"tree": {
"$path": "plugin/src"
}
}
1 change: 1 addition & 0 deletions docs/Using.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Blink supports the following primitives:
|CFrame |24 Bytes |No |N/A |N/A |
|Color3 |12 Bytes |No |N/A |N/A |
|Instance|4 Bytes |No |N/A |N/A |
|unknown |N/A |No |N/A |N/A |

Arrays can be defined by appending `[SIZE]` or `[[MIN]..[MAX]]` after the primitive type
Primitives can be constrained to ranges by writing `([MIN]..[MAX])` after the primitive type. Ranges are inclusive.
Expand Down
2 changes: 1 addition & 1 deletion plugin/.darklua.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{
"identifier": "VERSION",
"rule": "inject_global_value",
"value": "0.6.4"
"value": "0.7.0"
}
]
}
11 changes: 9 additions & 2 deletions plugin/build.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
@echo Off

copy ".\src\Error.rbxmx" ".\bundle\Error.rbxmx"
copy ".\src\Widget.rbxmx" ".\bundle\Widget.rbxmx"
copy "..\build\.darklua.json" ".\.darklua.json"
darklua process "./src/init.luau" "./bundle/init.server.lua"
rojo build --output "%LocalAppData%\Roblox\Plugins\Blink.rbxmx"

darklua process "./src/init.server.luau" "./bundle/init.server.lua"
rojo build bundle.project.json --output "%LocalAppData%\Roblox\Plugins\Blink.rbxmx"

cd ..
rojo sourcemap --output sourcemap.json --include-non-scripts
cd plugin
File renamed without changes.
Binary file removed plugin/bundle/Error.rbxm
Binary file not shown.
188 changes: 188 additions & 0 deletions plugin/bundle/Error.rbxmx
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
<roblox xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.roblox.com/roblox.xsd" version="4">
<Meta name="ExplicitAutoJoints">true</Meta>
<External>null</External>
<External>nil</External>
<Item class="Frame" referent="RBX936A437C12194BF983497DF5E6781423">
<Properties>
<bool name="Active">false</bool>
<Vector2 name="AnchorPoint">
<X>0</X>
<Y>0</Y>
</Vector2>
<BinaryString name="AttributesSerialize"></BinaryString>
<bool name="AutoLocalize">true</bool>
<token name="AutomaticSize">0</token>
<Color3 name="BackgroundColor3">
<R>0.156862751</R>
<G>0.156862751</G>
<B>0.156862751</B>
</Color3>
<float name="BackgroundTransparency">0</float>
<Color3 name="BorderColor3">
<R>0</R>
<G>0</G>
<B>0</B>
</Color3>
<token name="BorderMode">0</token>
<int name="BorderSizePixel">0</int>
<SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
<bool name="ClipsDescendants">false</bool>
<bool name="DefinesCapabilities">false</bool>
<bool name="Draggable">false</bool>
<bool name="Interactable">true</bool>
<int name="LayoutOrder">0</int>
<string name="Name">Error</string>
<Ref name="NextSelectionDown">null</Ref>
<Ref name="NextSelectionLeft">null</Ref>
<Ref name="NextSelectionRight">null</Ref>
<Ref name="NextSelectionUp">null</Ref>
<UDim2 name="Position">
<XS>0</XS>
<XO>0</XO>
<YS>0</YS>
<YO>0</YO>
</UDim2>
<Ref name="RootLocalizationTable">null</Ref>
<float name="Rotation">0</float>
<bool name="Selectable">false</bool>
<token name="SelectionBehaviorDown">0</token>
<token name="SelectionBehaviorLeft">0</token>
<token name="SelectionBehaviorRight">0</token>
<token name="SelectionBehaviorUp">0</token>
<bool name="SelectionGroup">false</bool>
<Ref name="SelectionImageObject">null</Ref>
<int name="SelectionOrder">0</int>
<UDim2 name="Size">
<XS>1</XS>
<XO>0</XO>
<YS>1</YS>
<YO>0</YO>
</UDim2>
<token name="SizeConstraint">0</token>
<int64 name="SourceAssetId">-1</int64>
<token name="Style">0</token>
<BinaryString name="Tags"></BinaryString>
<bool name="Visible">false</bool>
<int name="ZIndex">3</int>
</Properties>
<Item class="TextLabel" referent="RBXA28D544ABC854CEF8B281AAE67F044D5">
<Properties>
<bool name="Active">false</bool>
<Vector2 name="AnchorPoint">
<X>0</X>
<Y>0</Y>
</Vector2>
<BinaryString name="AttributesSerialize"></BinaryString>
<bool name="AutoLocalize">true</bool>
<token name="AutomaticSize">0</token>
<Color3 name="BackgroundColor3">
<R>1</R>
<G>1</G>
<B>1</B>
</Color3>
<float name="BackgroundTransparency">1</float>
<Color3 name="BorderColor3">
<R>0</R>
<G>0</G>
<B>0</B>
</Color3>
<token name="BorderMode">0</token>
<int name="BorderSizePixel">0</int>
<SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
<bool name="ClipsDescendants">false</bool>
<bool name="DefinesCapabilities">false</bool>
<bool name="Draggable">false</bool>
<Font name="FontFace">
<Family><url>rbxasset://fonts/families/Ubuntu.json</url></Family>
<Weight>400</Weight>
<Style>Normal</Style>
</Font>
<bool name="Interactable">true</bool>
<int name="LayoutOrder">0</int>
<float name="LineHeight">1</float>
<string name="LocalizationMatchIdentifier"></string>
<string name="LocalizationMatchedSourceText"></string>
<int name="MaxVisibleGraphemes">-1</int>
<string name="Name">Text</string>
<Ref name="NextSelectionDown">null</Ref>
<Ref name="NextSelectionLeft">null</Ref>
<Ref name="NextSelectionRight">null</Ref>
<Ref name="NextSelectionUp">null</Ref>
<UDim2 name="Position">
<XS>0</XS>
<XO>0</XO>
<YS>0</YS>
<YO>0</YO>
</UDim2>
<bool name="RichText">true</bool>
<Ref name="RootLocalizationTable">null</Ref>
<float name="Rotation">0</float>
<bool name="Selectable">false</bool>
<token name="SelectionBehaviorDown">0</token>
<token name="SelectionBehaviorLeft">0</token>
<token name="SelectionBehaviorRight">0</token>
<token name="SelectionBehaviorUp">0</token>
<bool name="SelectionGroup">false</bool>
<Ref name="SelectionImageObject">null</Ref>
<int name="SelectionOrder">0</int>
<UDim2 name="Size">
<XS>1</XS>
<XO>0</XO>
<YS>1</YS>
<YO>0</YO>
</UDim2>
<token name="SizeConstraint">0</token>
<int64 name="SourceAssetId">-1</int64>
<BinaryString name="Tags"></BinaryString>
<string name="Text">Label</string>
<Color3 name="TextColor3">
<R>1</R>
<G>1</G>
<B>1</B>
</Color3>
<token name="TextDirection">0</token>
<bool name="TextScaled">false</bool>
<float name="TextSize">16</float>
<Color3 name="TextStrokeColor3">
<R>0</R>
<G>0</G>
<B>0</B>
</Color3>
<float name="TextStrokeTransparency">1</float>
<float name="TextTransparency">0</float>
<token name="TextTruncate">0</token>
<bool name="TextWrapped">false</bool>
<token name="TextXAlignment">0</token>
<token name="TextYAlignment">0</token>
<bool name="Visible">true</bool>
<int name="ZIndex">1</int>
</Properties>
</Item>
<Item class="UIPadding" referent="RBX7B12D8529A424F6EB0577B00BA8AF991">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<SecurityCapabilities name="Capabilities">0</SecurityCapabilities>
<bool name="DefinesCapabilities">false</bool>
<string name="Name">UIPadding</string>
<UDim name="PaddingBottom">
<S>0</S>
<O>8</O>
</UDim>
<UDim name="PaddingLeft">
<S>0</S>
<O>8</O>
</UDim>
<UDim name="PaddingRight">
<S>0</S>
<O>8</O>
</UDim>
<UDim name="PaddingTop">
<S>0</S>
<O>8</O>
</UDim>
<int64 name="SourceAssetId">-1</int64>
<BinaryString name="Tags"></BinaryString>
</Properties>
</Item>
</Item>
</roblox>
Binary file removed plugin/bundle/Widget.rbxm
Binary file not shown.
Loading

0 comments on commit 4fe38fe

Please sign in to comment.