diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 6ffebea2..d0fd07b9 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,5 +1,6 @@ { "recommendations": [ + "BlueGlassBlock.better-json5", "JohnnyMorganz.luau-lsp", "JohnnyMorganz.stylua", "Kampfkarren.selene-vscode", diff --git a/.vscode/settings.json b/.vscode/settings.json index f6578386..1c42ca6e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,39 @@ { + "editor.tabSize": 2, + "editor.insertSpaces": true, + "editor.rulers": [ + 80 + ], + + "files.eol": "\n", + "files.encoding": "utf8", + "files.autoGuessEncoding": false, + "luau-lsp.sourcemap.rojoProjectFile": "plugin.project.json", - "luau-lsp.sourcemap.autogenerate": true + "luau-lsp.plugin.maximumRequestBodySize": "500mb", + "luau-lsp.plugin.enabled": true, + "luau-lsp.completion.autocompleteEnd": true, + "luau-lsp.completion.imports.enabled": true, + "luau-lsp.completion.imports.separateGroupsWithLine": true, + "luau-lsp.hover.multilineFunctionDefinitions": true, + "luau-lsp.hover.showTableKinds": true, + "luau-lsp.inlayHints.makeInsertable": false, + "luau-lsp.inlayHints.hideHintsForMatchingParameterNames": false, + "luau-lsp.sourcemap.autogenerate": true, + "luau-lsp.sourcemap.includeNonScripts": true, + "luau-lsp.diagnostics.strictDatamodelTypes": true, + "luau-lsp.completion.imports.requireStyle": "alwaysAbsolute", + "luau-lsp.completion.fillCallArguments": false, + "luau-lsp.completion.showDeprecatedItems": false, + "luau-lsp.sourcemap.generatorCommand": "atlas", + "luau-lsp.fflags.enableNewSolver": false, + "luau-lsp.index.maxFiles": 100000, + "luau-lsp.plugin.port": 3668, + + "stylua.targetReleaseVersion": "latest", + "[luau]": { + "editor.defaultFormatter": "JohnnyMorganz.stylua" + }, + + "git.ignoreLimitWarning": true } diff --git a/assets/project-templates/place/.vscode/extensions.json b/assets/project-templates/place/.vscode/extensions.json index b1f73466..b335a9d0 100644 --- a/assets/project-templates/place/.vscode/extensions.json +++ b/assets/project-templates/place/.vscode/extensions.json @@ -1,7 +1,5 @@ { "recommendations": [ - "evaera.vscode-rojo", - "johnnymorganz.stylua", - "johnnymorganz.luau-lsp" + "UserGeneratedLLC.vscode-roblox-atlas" ] } \ No newline at end of file diff --git a/assets/project-templates/place/.vscode/settings.json b/assets/project-templates/place/.vscode/settings.json index 95aa6113..37e4a9bd 100644 --- a/assets/project-templates/place/.vscode/settings.json +++ b/assets/project-templates/place/.vscode/settings.json @@ -4,16 +4,17 @@ "editor.rulers": [ 80 ], + "files.eol": "\n", "files.encoding": "utf8", "files.autoGuessEncoding": false, + "luau-lsp.sourcemap.rojoProjectFile": "plugin.project.json5", "luau-lsp.plugin.maximumRequestBodySize": "500mb", "luau-lsp.plugin.enabled": true, "luau-lsp.completion.autocompleteEnd": true, "luau-lsp.completion.imports.enabled": true, "luau-lsp.completion.imports.separateGroupsWithLine": true, - "luau-lsp.completion.showPropertiesOnMethodCall": true, "luau-lsp.hover.multilineFunctionDefinitions": true, "luau-lsp.hover.showTableKinds": true, "luau-lsp.inlayHints.makeInsertable": false, @@ -22,11 +23,16 @@ "luau-lsp.sourcemap.includeNonScripts": true, "luau-lsp.diagnostics.strictDatamodelTypes": true, "luau-lsp.completion.imports.requireStyle": "alwaysAbsolute", + "luau-lsp.completion.fillCallArguments": false, + "luau-lsp.completion.showDeprecatedItems": false, + "luau-lsp.sourcemap.generatorCommand": "atlas", "luau-lsp.fflags.enableNewSolver": false, + "luau-lsp.index.maxFiles": 100000, + "stylua.targetReleaseVersion": "latest", "[luau]": { "editor.defaultFormatter": "JohnnyMorganz.stylua" }, - "stylua.targetReleaseVersion": "latest", - "git.ignoreLimitWarning": true, + + "git.ignoreLimitWarning": true } diff --git a/vscode-rojo b/vscode-rojo index da517e6a..a05977d6 160000 --- a/vscode-rojo +++ b/vscode-rojo @@ -1 +1 @@ -Subproject commit da517e6a7fcaf40ed023c17511a7f46f45637a67 +Subproject commit a05977d6b8107c1ddc5dca7d4d26819ddd6582ba