Merge pull request #727 from rage/locking

Fix locking

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [3.0.5] - 2024-10-29
+
+-   Bumped TMC-langs version to 0.36.4
+-   Fixed issues with file locking on certain platforms
+-   Fixed the current file not refreshing when resetting an exercise
+
 ## [3.0.4] - 2024-08-29
 
 -   Bumped TMC-langs version to 0.36.3

CONTRIBUTING.md

@@ -6,11 +6,11 @@ You can start by looking through the issues marked with label [`good first issue
 
 ## Project structure
 
-- `./src`: contains the "backend" of the extension
-  - `./src/actions`: Contains composable actions used by the VSCode commands and other actions
-  - `./src/commands`: Contains a source file for each VSCode command contributed by the extension
-- `./webview-ui`: contains the "frontend" of the extension
-- `./shared`: contains types that are shared between the backend and frontend
+-   `./src`: contains the "backend" of the extension
+    -   `./src/actions`: Contains composable actions used by the VSCode commands and other actions
+    -   `./src/commands`: Contains a source file for each VSCode command contributed by the extension
+-   `./webview-ui`: contains the "frontend" of the extension
+-   `./shared`: contains types that are shared between the backend and frontend
 
 ## Setup
 
@@ -99,8 +99,8 @@ To release, create a release with the tag in the format `vMAJOR.MINOR.PATCH`, fo
 
 A script, `./bin/validateRelease.sh`, is ran during the release process to ensure that
 
-- the `CHANGELOG.md` has an entry for the tagged version
-- the `package.json` and `package-lock.json` has the same version number as the tagged version
+-   the `CHANGELOG.md` has an entry for the tagged version
+-   the `package.json` and `package-lock.json` has the same version number as the tagged version
 
 You can update the `package-lock.json` version with `npm i --package-lock-only`.
 
@@ -111,5 +111,8 @@ The extension is packaged using the script `./bin/package.bash`. Like the valida
 ## Other notes
 
 Running the extension produces the following superfluous warnings:
-- `An iframe which has both allow-scripts and allow-same-origin for its sandbox attribute can escape its sandboxing.`: https://github.com/microsoft/vscode/issues/192853
-- `[Violation] Avoid using document.write(). <URL>`: https://github.com/microsoft/vscode/issues/156147
+
+-   `An iframe which has both allow-scripts and allow-same-origin for its sandbox attribute can escape its sandboxing.`: https://github.com/microsoft/vscode/issues/192853
+-   `[Violation] Avoid using document.write(). <URL>`: https://github.com/microsoft/vscode/issues/156147
+
+Updating langs can be done by changing the version number at `config.js`.

config.js

@@ -3,7 +3,7 @@
 
 const path = require("path");
 
-const TMC_LANGS_RUST_VERSION = "0.36.3";
+const TMC_LANGS_RUST_VERSION = "0.36.4";
 
 const mockTmcLocalMooc = {
     __TMC_BACKEND_URL__: JSON.stringify("http://localhost:4001"),

package.json

@@ -1,7 +1,7 @@
 {
     "name": "test-my-code",
     "displayName": "TestMyCode",
-    "version": "3.0.4",
+    "version": "3.0.5",
     "description": "TestMyCode extension for Visual Studio Code",
     "categories": [
         "Education",

src/commands/resetExercise.ts

@@ -53,6 +53,6 @@ export async function resetExercise(
 
     if (editor && document) {
         Logger.debug(`Reopening original file "${document.fsPath}"`);
-        await vscode.commands.executeCommand("vscode.open", document, editor.viewColumn);
+        await vscode.commands.executeCommand("workbench.action.files.revert", document);
     }
 }

webview-ui/src/panels/Welcome.svelte

@@ -72,6 +72,18 @@
         <!-- This list should generally contain only the last couple versions/months worth of updates -->
 
         <div class="content_section">
+            <h3>3.0.5 - 2024-10-29</h3>
+            <h4>Fixed file locking issues</h4>
+            <p>
+                Fixed issues relating to file locking on certain platforms that prevented the
+                extension from running.
+            </p>
+            <h4>Fixed the current file not refreshing when resetting an exercise</h4>
+            <p>
+                Previously, the contents of the current file would not refresh properly in the
+                editor when resetting an exercise, showing the old state instead of the actual
+                contents of the file on disk.
+            </p>
             <h3>3.0.4 - 2024-08-29</h3>
             <h4>.csproj files are no longer included when submitting C# exercises</h4>
             <p>