preliminary Starfield support

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: "Build"
 on:
   push:
     branches:
-      - '**'
+      - "**"
 
 jobs:
   build:
@@ -15,7 +15,7 @@ jobs:
       - name: git credentials
         uses: oleksiyrudenko/gha-git-credentials@v2-latest
         with:
-          token: '${{ secrets.GH_TOKEN }}'
+          token: "${{ secrets.GH_TOKEN }}"
           global: true
 
       - name: Checkout
@@ -97,4 +97,12 @@ jobs:
           # TODO: Rename this stuff for clarity once release build artifacts are being created
           # TODO: Cleanup workflows for various event types in general
           RELEASE: ${{( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/prerelease') && github.event_name != 'pull_request' && github.event_name != 'pull_request_target' }}
-          PRERELEASE: ${{ github.ref == 'refs/heads/prerelease' && github.event_name != 'pull_request' && github.event_name != 'pull_request_target' }}
+          PRERELEASE: ${{ github.ref == 'refs/heads/prerelease' && github.event_name != 'pull_request' && github.event_name != 'pull_request_target' }}
+
+      - name: Upload Artifact
+        if: success()
+        uses: actions/upload-artifact@v2
+        continue-on-error: true
+        with:
+          name: artifact
+          path: c:/repo/src/papyrus-lang-vscode/papyrus-lang-*.vsix

.vscode/launch.json

@@ -13,7 +13,26 @@
       "args": [
         "--extensionDevelopmentPath=${workspaceFolder}/src/papyrus-lang-vscode"
       ],
-      "outFiles": ["${workspaceFolder}/src/papyrus-lang-vscode/out/**/*.js"]
+      "outFiles": [
+        "${workspaceFolder}/src/papyrus-lang-vscode/dist/*.js"
+      ],
+    },
+    {
+      "name": "Launch (Build extension and build and copy binaries only)",
+      "type": "extensionHost",
+      "request": "launch",
+      "runtimeExecutable": "${execPath}",
+      "preLaunchTask": "buildExtensionAndUpdateBin",
+      "args": [
+        "--extensionDevelopmentPath=${workspaceFolder}/src/papyrus-lang-vscode"
+      ],
+      "sourceMaps": true,
+      "outFiles": [
+        "${workspaceFolder}/src/papyrus-lang-vscode/dist/*.js"
+      ],
+      "cwd": "${workspaceFolder}/src/papyrus-lang-vscode",
+      "internalConsoleOptions": "openOnSessionStart",
+      "outputCapture": "console"
     },
     {
       "name": "Launch (Build and copy binaries only)",
@@ -24,18 +43,29 @@
       "args": [
         "--extensionDevelopmentPath=${workspaceFolder}/src/papyrus-lang-vscode"
       ],
-      "outFiles": ["${workspaceFolder}/src/papyrus-lang-vscode/out/**/*.js"]
+      "sourceMaps": true,
+      "outFiles": [
+        "${workspaceFolder}/src/papyrus-lang-vscode/dist/*.js"
+      ],
+      "cwd": "${workspaceFolder}/src/papyrus-lang-vscode",
+      "internalConsoleOptions": "openOnSessionStart",
+      "outputCapture": "console"
     },
     {
       "name": "Launch (Build extension only)",
       "type": "extensionHost",
       "request": "launch",
+      "pauseForSourceMap": true,
       "runtimeExecutable": "${execPath}",
       "preLaunchTask": "buildExtension",
       "args": [
         "--extensionDevelopmentPath=${workspaceFolder}/src/papyrus-lang-vscode"
       ],
-      "outFiles": ["${workspaceFolder}/src/papyrus-lang-vscode/out/**/*.js"]
+      "outFiles": [
+        "${workspaceFolder}/src/papyrus-lang-vscode/dist/*.js"
+      ],
+      "sourceMaps": true,
+      "internalConsoleOptions": "openOnSessionStart"
     },
     {
       "name": "Launch (No build)",
@@ -45,7 +75,11 @@
       "args": [
         "--extensionDevelopmentPath=${workspaceFolder}/src/papyrus-lang-vscode"
       ],
-      "outFiles": ["${workspaceFolder}/src/papyrus-lang-vscode/out/**/*.js"]
+      "outFiles": [
+        "${workspaceFolder}/src/papyrus-lang-vscode/dist/*.js"
+      ],
+      "sourceMaps": true,
+      "internalConsoleOptions": "openOnSessionStart"
     }
   ]
-}
+}

.vscode/tasks.json

@@ -15,7 +15,13 @@
           "cake"
         ]
       },
-      "problemMatcher": ["$tsc", "$msCompile"]
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+      "problemMatcher": [
+        "$tsc",
+        "$msCompile"
+      ]
     },
     {
       "label": "updateBin",
@@ -26,9 +32,38 @@
           "--target=\"update-bin\""
         ]
       },
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
+      "command": "./build.sh",
+      "args": [
+        "--target=\"update-bin\""
+      ],
+      "problemMatcher": [
+        "$tsc",
+        "$msCompile"
+      ]
+    },
+    {
+      "label": "buildExtensionAndUpdateBin",
+      "windows": {
+        "command": "dotnet",
+        "args": [
+          "cake",
+          "--target=\"build-extension-and-update-bin\""
+        ]
+      },
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
       "command": "./build.sh",
-      "args": ["--target=\"update-bin\""],
-      "problemMatcher": ["$tsc", "$msCompile"]
+      "args": [
+        "--target=\"build-extension-and-update-bin\""
+      ],
+      "problemMatcher": [
+        "$tsc",
+        "$msCompile"
+      ]
     },
     {
       "label": "buildExtension",
@@ -39,9 +74,28 @@
           "--target=\"build-extension\""
         ]
       },
+      "options": {
+        "cwd": "${workspaceFolder}"
+      },
       "command": "./build.sh",
-      "args": ["--target=\"build-extension\""],
-      "problemMatcher": ["$tsc", "$msCompile"]
+      "args": [
+        "--target=\"build-extension\""
+      ],
+      "problemMatcher": [
+        "$tsc",
+        "$msCompile"
+      ]
+    },
+    {
+      "label": "tsc",
+      "type": "shell",
+      "command": "tsc",
+      "options": {
+        "cwd": "${workspaceFolder}/src/papyrus-lang-vscode"
+      },
+      "problemMatcher": [
+        "$tsc"
+      ]
     }
   ]
-}
+}

build.cake

@@ -210,14 +210,17 @@ Task("copy-debug-plugin")
             CreateDirectory("./src/papyrus-lang-vscode/debug-plugin");
 
             var configuration = isRelease ? "Release" : "Debug";
+            var skyrimPath = $"src/DarkId.Papyrus.DebugServer/bin/DarkId.Papyrus.DebugServer.Skyrim/x64/{configuration}/DarkId.Papyrus.DebugServer.Skyrim.dll";
+            var fallout4Path = $"src/DarkId.Papyrus.DebugServer/bin/DarkId.Papyrus.DebugServer.Fallout4/x64/{configuration}/DarkId.Papyrus.DebugServer.Fallout4.dll";
+            var copyDir = "./src/papyrus-lang-vscode/debug-plugin";
 
             CopyFileToDirectory(
-                $"src/DarkId.Papyrus.DebugServer/bin/DarkId.Papyrus.DebugServer.Skyrim/x64/{configuration}/DarkId.Papyrus.DebugServer.Skyrim.dll",
-                "./src/papyrus-lang-vscode/debug-plugin");
+                skyrimPath,
+                copyDir);
 
             CopyFileToDirectory(
-                $"src/DarkId.Papyrus.DebugServer/bin/DarkId.Papyrus.DebugServer.Fallout4/x64/{configuration}/DarkId.Papyrus.DebugServer.Fallout4.dll",
-                "./src/papyrus-lang-vscode/debug-plugin");
+                fallout4Path,
+                copyDir);
         }
         catch (Exception)
         {
@@ -353,6 +356,11 @@ Task("update-bin")
 Task("build-extension")
     .IsDependentOn("npm-build");
 
+Task("build-extension-and-update-bin")
+    .IsDependentOn("build-debugger")
+    .IsDependentOn("update-bin")
+    .IsDependentOn("build-extension");
+
 Task("build-test")
     .IsDependentOn("build")
     .IsDependentOn("test");

src/DarkId.Papyrus.DebugServer/PexCache.cpp

@@ -80,7 +80,7 @@ namespace DarkId::Papyrus::DebugServer
 		}
 		data.name = normname;
 		data.path = headerSrcName;
-		data.sourceReference = sourceReference;
+		data.sourceReference = sourceReference; // TODO: Remember to remove this when we get script references from the extension working
 		return true;
 	}
 

src/DarkId.Papyrus.DebugServer/RuntimeEvents.cpp

@@ -523,7 +523,7 @@ namespace DarkId::Papyrus::DebugServer
 			if (tasklet->topFrame)
 			{
 				// We don't need to set the instruction pointer because Fallout 4 assigns the IP every time an opcode is executed
-				g_InstructionExecutionEvent(tasklet, tasklet->topFrame->STACK_FRAME_IP);
+				g_InstructionExecutionEvent(tasklet);
 			}
 		}
 		// TODO: There's a second CreateStack() @ 1427422C0, do we need to hook that?

src/papyrus-lang-vscode/.eslintrc.js

@@ -9,10 +9,16 @@ module.exports = {
     overrides: [
         {
             files: ['*.ts'],
-            plugins: ['@typescript-eslint'],
+            plugins: ['@typescript-eslint', 'unused-imports'],
             extends: ['plugin:@typescript-eslint/recommended'],
             rules: {
-                '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+                '@typescript-eslint/no-unused-vars': 'off',
+                'unused-imports/no-unused-imports': 'error',
+                'unused-imports/no-unused-vars': [
+                    'warn',
+                    { vars: 'all', varsIgnorePattern: '^_', args: 'after-used', argsIgnorePattern: '^_' },
+                ],
+                'prettier/prettier': 'warn',
             },
         },
     ],

src/papyrus-lang-vscode/.gitignore

@@ -1,5 +1,6 @@
 debug-bin
 debug-plugin
+debug-address-library
 pyro
 out
 node_modules