From aea00c268aa3159d4cc1e7377aeb793c8840f375 Mon Sep 17 00:00:00 2001 From: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> Date: Sat, 28 Jun 2025 23:51:21 +0200 Subject: [PATCH] Port uninplemented upstream VSCode QOL improvements (PR #33891) (#4019) * Update extensions.json Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> * Update launch.json Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> * Update tasks.json Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> --------- Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> --- .vscode/extensions.json | 7 ++- .vscode/launch.json | 95 +++++++++++++++++++++++++++++++++++++---- .vscode/tasks.json | 84 +++++++++++++++++------------------- 3 files changed, 133 insertions(+), 53 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 83bca6f97b..8708baec8c 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,11 @@ { "recommendations": [ "ms-dotnettools.csharp", - "editorconfig.editorconfig" + "editorconfig.editorconfig", + "ertanic.robust-lsp", + "GitHub.vscode-pull-request-github", + "eamodio.gitlens", + "macabeus.vscode-fluent", + "redhat.vscode-yaml" ] } diff --git a/.vscode/launch.json b/.vscode/launch.json index 5390b91409..63fc9e4564 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,6 +4,17 @@ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 "version": "0.2.0", "configurations": [ + { + "name": "YAML Linter", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build-yaml-linter", + "program": "${workspaceFolder}/bin/Content.YAMLLinter/Content.YAMLLinter.dll", + "cwd": "${workspaceFolder}/Content.YAMLLinter", + "console": "internalConsole", + "stopAtEntry": false + }, + // Client configurations { "name": "Client", "type": "coreclr", @@ -14,7 +25,28 @@ "stopAtEntry": false }, { - "name": "Client (Compatibility renderer)", + "name": "Client - Tools", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build - Tools", + "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll", + "args": [], + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": "Client - Release", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build - Release", + "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll", + "args": [], + "console": "internalConsole", + "stopAtEntry": false + }, + // Compatibility renderer client configurations + { + "name": "Client - (Compatibility renderer)", "type": "coreclr", "request": "launch", "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll", @@ -22,6 +54,27 @@ "console": "internalConsole", "stopAtEntry": false }, + { + "name": "Client - Tools - (Compatibility renderer)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build - Tools", + "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll", + "args": ["--cvar display.compat=true"], + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": "Client - Release - (Compatibility renderer)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build - Release", + "program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll", + "args": ["--cvar display.compat=true"], + "console": "internalConsole", + "stopAtEntry": false + }, + // Server configurations { "name": "Server", "type": "coreclr", @@ -32,15 +85,25 @@ "stopAtEntry": false }, { - "name": "YAML Linter", + "name": "Server - Tools", "type": "coreclr", "request": "launch", - "preLaunchTask": "build-yaml-linter", - "program": "${workspaceFolder}/bin/Content.YAMLLinter/Content.YAMLLinter.dll", - "cwd": "${workspaceFolder}/Content.YAMLLinter", - "console": "internalConsole", + "preLaunchTask": "build - Tools", + "program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll", + "args": [""], + "console": "integratedTerminal", "stopAtEntry": false - } + }, + { + "name": "Server - Release", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build - Release", + "program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll", + "args": [""], + "console": "integratedTerminal", + "stopAtEntry": false + }, ], "compounds": [ { @@ -50,6 +113,22 @@ "Client" ], "preLaunchTask": "build" + }, + { + "name": "Server/Client - Tools", + "configurations": [ + "Server - Tools", + "Client - Tools" + ], + "preLaunchTask": "build - Tools" + }, + { + "name": "Server/Client - Release", + "configurations": [ + "Server - Release", + "Client - Release" + ], + "preLaunchTask": "build - Release" } ] -} \ No newline at end of file +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7f4efc8c9a..7b8409d3d9 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -21,6 +21,46 @@ }, "problemMatcher": "$msCompile" }, + { + "label": "build - Tools", + "command": "dotnet", + "type": "shell", + "args": [ + "build", + "--configuration", + "Tools", + "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names. + "/consoleloggerparameters:'ForceNoAlign;NoSummary'", // Do not generate summary otherwise it leads to duplicate errors in Problems panel + ], + "group": { + "kind": "build", + "isDefault": false + }, + "presentation": { + "reveal": "silent" + }, + "problemMatcher": "$msCompile" + }, + { + "label": "build - Release", + "command": "dotnet", + "type": "shell", + "args": [ + "build", + "--configuration", + "Release", + "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names. + "/consoleloggerparameters:'ForceNoAlign;NoSummary'", // Do not generate summary otherwise it leads to duplicate errors in Problems panel + ], + "group": { + "kind": "build", + "isDefault": false + }, + "presentation": { + "reveal": "silent" + }, + "problemMatcher": "$msCompile" + }, { "label": "build-yaml-linter", "command": "dotnet", @@ -32,50 +72,6 @@ "/consoleloggerparameters:'ForceNoAlign;NoSummary'" ], "problemMatcher": "$msCompile" - }, - { - "label": "test", - "command": "dotnet", - "type": "shell", - "args": [ - "test", - "--no-build", - "--configuration", - "DebugOpt", - "Content.Tests/Content.Tests.csproj", - "--", - "NUnit.ConsoleOut=0" - ], - "group": { - "kind": "test" - }, - "presentation": { - "reveal": "silent" - }, - "problemMatcher": "$msCompile" - }, - { - "label": "integration-test", - "command": "dotnet", - "type": "shell", - "args": [ - "test", - "--no-build", - "--configuration", - "DebugOpt", - "Content.IntegrationTests/Content.IntegrationTests.csproj", - "--", - "NUnit.ConsoleOut=0", - "NUnit.MapWarningTo=Failed.ConsoleOut=0", - "NUnit.MapWarningTo=Failed" - ], - "group": { - "kind": "test" - }, - "presentation": { - "reveal": "silent" - }, - "problemMatcher": "$msCompile" } ] }