From 70ab8deeaa9e6728f21ed361720dc6aa55e91cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Clemmensen?= Date: Fri, 22 Sep 2023 23:54:05 +0200 Subject: [PATCH 01/12] Update problem-matcher.json --- src/problem-matcher.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/problem-matcher.json b/src/problem-matcher.json index 83875a33..842d7666 100644 --- a/src/problem-matcher.json +++ b/src/problem-matcher.json @@ -4,7 +4,7 @@ "owner": "dotnet-format", "pattern": [ { - "regexp": "^\\s+(.*)\\((\\d+),(\\d+)\\):\\s+(.*)$", + "regexp": "^\\s*(.*)\\((\d+),(\\d+)\\):\\s+(.*)\\s+\\[.*]$", "file": 1, "line": 2, "column": 3, From 327fb5e3b872b54734620f308f83e2bb083cf3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Clemmensen?= Date: Fri, 22 Sep 2023 23:56:41 +0200 Subject: [PATCH 02/12] bump --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 56065763..e3d605cd 100644 --- a/README.md +++ b/README.md @@ -36,3 +36,4 @@ Name | Allowed values | Description ## License The scripts and documentation in this project are released under the [MIT License](LICENSE) + From 4989e8a46200a36b9ac53df22b39c8d0752eb9b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Clemmensen?= Date: Fri, 22 Sep 2023 23:57:58 +0200 Subject: [PATCH 03/12] bad d --- src/problem-matcher.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/problem-matcher.json b/src/problem-matcher.json index 842d7666..b18c83bc 100644 --- a/src/problem-matcher.json +++ b/src/problem-matcher.json @@ -4,7 +4,7 @@ "owner": "dotnet-format", "pattern": [ { - "regexp": "^\\s*(.*)\\((\d+),(\\d+)\\):\\s+(.*)\\s+\\[.*]$", + "regexp": "^\\s*(.*)\\((\\d+),(\\d+)\\):\\s+(.*)\\s+\\[.*]$", "file": 1, "line": 2, "column": 3, From c6b3fe5f7d45244687a4b625398e2692f4c8f0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Clemmensen?= Date: Sat, 23 Sep 2023 00:13:07 +0200 Subject: [PATCH 04/12] Adjust tests + pattern --- __tests__/problemMatcher.test.ts | 33 +++++++++++++++++--------------- src/problem-matcher.json | 2 +- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/__tests__/problemMatcher.test.ts b/__tests__/problemMatcher.test.ts index c8600312..f1ed8a11 100644 --- a/__tests__/problemMatcher.test.ts +++ b/__tests__/problemMatcher.test.ts @@ -15,11 +15,9 @@ describe("problemMatcher", () => { describe("pattern", () => { const reportOutput = [ - " Formatting code files in workspace 'C:\\dev\\application\\application.sln'.", - " src\\ConsoleApp\\Program.cs(5,18): Fix whitespace formatting 1.", - " src\\ConsoleApp\\Program.cs(8,30): Fix whitespace formatting 2.", - " Formatted code file 'Program.cs'.", - " Format complete in 4451ms.", + "/path/file.cs(15,2): error WHITESPACE: Fix whitespace formatting. Insert '\t'. [/path/project.csproj]", + "/path/file.cs(15,3): error WHITESPACE: Fix whitespace formatting. Replace 4 characters with '\n\t\t\t'. [/path/project.csproj]", + "/path/file.cs(16,84): error WHITESPACE: Fix whitespace formatting. Replace 4 characters with '\n\t\t\t'. [/path/project.csproj]", ]; let pattern: ProblemPattern; @@ -34,19 +32,24 @@ describe("problemMatcher", () => { }); it("matches violations", () => { - expect(results.length).toEqual(2); + expect(results.length).toEqual(3); }); it("matches violation details", () => { - expect(results[0][pattern.file]).toEqual("src\\ConsoleApp\\Program.cs"); - expect(results[0][pattern.line]).toEqual("5"); - expect(results[0][pattern.column]).toEqual("18"); - expect(results[0][pattern.message]).toEqual("Fix whitespace formatting 1."); - - expect(results[1][pattern.file]).toEqual("src\\ConsoleApp\\Program.cs"); - expect(results[1][pattern.line]).toEqual("8"); - expect(results[1][pattern.column]).toEqual("30"); - expect(results[1][pattern.message]).toEqual("Fix whitespace formatting 2."); + expect(results[0][pattern.file]).toEqual("/path/file.cs"); + expect(results[0][pattern.line]).toEqual("15"); + expect(results[0][pattern.column]).toEqual("2"); + expect(results[0][pattern.message]).toEqual("error WHITESPACE: Fix whitespace formatting. Insert '\t'."); + + expect(results[1][pattern.file]).toEqual("/path/file.cs"); + expect(results[1][pattern.line]).toEqual("15"); + expect(results[1][pattern.column]).toEqual("3"); + expect(results[1][pattern.message]).toEqual("error WHITESPACE: Fix whitespace formatting. Replace 4 characters with '\n\t\t\t'."); + + expect(results[2][pattern.file]).toEqual("/path/file.cs"); + expect(results[2][pattern.line]).toEqual("16"); + expect(results[2][pattern.column]).toEqual("84"); + expect(results[2][pattern.message]).toEqual("error WHITESPACE: Fix whitespace formatting. Replace 4 characters with '\n\t\t\t'."); }); }); }); diff --git a/src/problem-matcher.json b/src/problem-matcher.json index b18c83bc..2aa9fb7c 100644 --- a/src/problem-matcher.json +++ b/src/problem-matcher.json @@ -4,7 +4,7 @@ "owner": "dotnet-format", "pattern": [ { - "regexp": "^\\s*(.*)\\((\\d+),(\\d+)\\):\\s+(.*)\\s+\\[.*]$", + "regexp": "^\\s*(.*)\\((\\d+),(\\d+)\\):\\s+([^\\[]+) ", "file": 1, "line": 2, "column": 3, From c7f206167ce0000a255e1f5795c16f35063c249b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Clemmensen?= Date: Sat, 23 Sep 2023 00:20:20 +0200 Subject: [PATCH 05/12] Fix package step --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92f54a2c..83d74d0d 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "build": "tsc", "lint": "tsc --noEmit", - "package": "ncc build src/main.ts", + "package": "ncc build src/main.ts && cp src/*.json dist/", "release": "npm run package && git add -f dist/", "test": "jest" }, From 4b01f2518700c001aa2a0c55fcd81054e9711bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Clemmensen?= Date: Sat, 23 Sep 2023 01:01:38 +0200 Subject: [PATCH 06/12] New pattern + tests --- __tests__/problemMatcher.test.ts | 8 +++++--- src/problem-matcher.json | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/__tests__/problemMatcher.test.ts b/__tests__/problemMatcher.test.ts index f1ed8a11..ddcb7612 100644 --- a/__tests__/problemMatcher.test.ts +++ b/__tests__/problemMatcher.test.ts @@ -39,17 +39,19 @@ describe("problemMatcher", () => { expect(results[0][pattern.file]).toEqual("/path/file.cs"); expect(results[0][pattern.line]).toEqual("15"); expect(results[0][pattern.column]).toEqual("2"); - expect(results[0][pattern.message]).toEqual("error WHITESPACE: Fix whitespace formatting. Insert '\t'."); + expect(results[0][pattern.message]).toEqual("Fix whitespace formatting. Insert '\t'."); + expect(results[0][pattern.severity]).toEqual("error"); + expect(results[0][pattern.code]).toEqual("WHITESPACE"); expect(results[1][pattern.file]).toEqual("/path/file.cs"); expect(results[1][pattern.line]).toEqual("15"); expect(results[1][pattern.column]).toEqual("3"); - expect(results[1][pattern.message]).toEqual("error WHITESPACE: Fix whitespace formatting. Replace 4 characters with '\n\t\t\t'."); + expect(results[1][pattern.message]).toEqual("Fix whitespace formatting. Replace 4 characters with '\n\t\t\t'."); expect(results[2][pattern.file]).toEqual("/path/file.cs"); expect(results[2][pattern.line]).toEqual("16"); expect(results[2][pattern.column]).toEqual("84"); - expect(results[2][pattern.message]).toEqual("error WHITESPACE: Fix whitespace formatting. Replace 4 characters with '\n\t\t\t'."); + expect(results[2][pattern.message]).toEqual("Fix whitespace formatting. Replace 4 characters with '\n\t\t\t'."); }); }); }); diff --git a/src/problem-matcher.json b/src/problem-matcher.json index 2aa9fb7c..2f7ef4ef 100644 --- a/src/problem-matcher.json +++ b/src/problem-matcher.json @@ -4,11 +4,14 @@ "owner": "dotnet-format", "pattern": [ { - "regexp": "^\\s*(.*)\\((\\d+),(\\d+)\\):\\s+([^\\[]+) ", + "regexp": "^\\s*(.*)\\((\\d+),(\\d+)\\): (\\w+) ([^:]+): ([^\\[]+) \\[(.*)\\]", "file": 1, "line": 2, "column": 3, - "message": 4 + "severity": 4, + "code": 5, + "message": 6, + "fromPath": 7 } ] } From f06b6b51152f4184f89e497c3ac187f7ec53aa0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Clemmensen?= Date: Sat, 23 Sep 2023 00:27:04 +0200 Subject: [PATCH 07/12] Node 16 --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index ba0807f1..0af325be 100644 --- a/action.yml +++ b/action.yml @@ -15,5 +15,5 @@ inputs: default: add runs: - using: "node12" + using: "node16" main: "dist/index.js" From 6578e8e7e0b70d6c50efbb4614ac6aeecf44b4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Clemmensen?= Date: Mon, 25 Sep 2023 11:36:51 +0200 Subject: [PATCH 08/12] Update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e3d605cd..6c9fccc1 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,10 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.101 + dotnet-version: 7.0.x - uses: xt0rted/dotnet-format-problem-matcher@v1 - run: dotnet tool install -g dotnet-format - - run: dotnet-format --dry-run + - run: dotnet format --no-restore --verify-no-changes ``` ![Example of inline annotations](docs/annotations.png) From aa9fdea7c69c30819eb0e54e97b44a10f20d4d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Clemmensen?= Date: Mon, 25 Sep 2023 11:37:27 +0200 Subject: [PATCH 09/12] Remove trailing newline --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c9fccc1..abb2b2e0 100644 --- a/README.md +++ b/README.md @@ -36,4 +36,4 @@ Name | Allowed values | Description ## License The scripts and documentation in this project are released under the [MIT License](LICENSE) - + \ No newline at end of file From 4db05f77a789b86e44b17cf3fbf5572bd92d815c Mon Sep 17 00:00:00 2001 From: nkf Date: Tue, 2 Jul 2024 15:47:09 +0200 Subject: [PATCH 10/12] Update to use node20 instead of node16 --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 0af325be..9a829104 100644 --- a/action.yml +++ b/action.yml @@ -15,5 +15,5 @@ inputs: default: add runs: - using: "node16" + using: "node20" main: "dist/index.js" From b9fa83e7539f163c485bbb6af91c4bf355595308 Mon Sep 17 00:00:00 2001 From: nkf Date: Tue, 2 Jul 2024 15:49:00 +0200 Subject: [PATCH 11/12] switch ci to use node20 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 591fc722..68248bf9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - node: [12, 14, 16] + node: [20] steps: - name: Check out repo From 5411ae05a5e6a54dba69ac8617f1dc93421b74a9 Mon Sep 17 00:00:00 2001 From: nkf Date: Tue, 2 Jul 2024 15:50:43 +0200 Subject: [PATCH 12/12] Fix use of deprecated setup-node --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68248bf9..ad142721 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v4.0.0 - name: Install Node - uses: actions/setup-node@v3.8.1 + uses: actions/setup-node@v4.0.2 with: node-version: ${{ matrix.node }}