From 319a59770aeb38a502a69c244e2a550075baa09c Mon Sep 17 00:00:00 2001
From: visualfc <visualfc@gmail.com>
Date: Wed, 8 Nov 2023 15:47:24 +0800
Subject: [PATCH 1/3] github actions: use goplus/setup-goplus

---
 .github/workflows/release-nightly.yml | 5 +++--
 .github/workflows/test-long-all.yml   | 5 +++--
 .github/workflows/test-long.yml       | 5 +++--
 .github/workflows/test-smoke.yml      | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml
index 028d57d0bb..bbbe4c9ab1 100644
--- a/.github/workflows/release-nightly.yml
+++ b/.github/workflows/release-nightly.yml
@@ -26,10 +26,11 @@ jobs:
          node-version: '18'
          cache: 'npm'
 
-      - name: Setup Go
-        uses: actions/setup-go@v3
+      - name: Setup Go/Go+
+        uses: goplus/setup-goplus@v1.1.0
         with:
          go-version: '1.21'
+         gop-version: "main"
          check-latest: true
          cache: true
 
diff --git a/.github/workflows/test-long-all.yml b/.github/workflows/test-long-all.yml
index 9e1eaa79eb..920fcebbde 100644
--- a/.github/workflows/test-long-all.yml
+++ b/.github/workflows/test-long-all.yml
@@ -29,10 +29,11 @@ jobs:
          node-version: '18'
          cache: 'npm'
 
-      - name: Setup Go
-        uses: actions/setup-go@v3
+      - name: Setup Go/Go+
+        uses: goplus/setup-goplus@v1.1.0
         with:
          go-version: ${{ matrix.go }}
+         gop-version: "main"
          check-latest: true
          cache: true
 
diff --git a/.github/workflows/test-long.yml b/.github/workflows/test-long.yml
index 4e3becf510..0cc3a16dc7 100644
--- a/.github/workflows/test-long.yml
+++ b/.github/workflows/test-long.yml
@@ -28,10 +28,11 @@ jobs:
          node-version: '18'
          cache: 'npm'
 
-      - name: Setup Go
-        uses: actions/setup-go@v3
+      - name: Setup Go/Go+
+        uses: goplus/setup-goplus@v1.1.0
         with:
          go-version: ${{ matrix.go }}
+         gop-version: "main"
          check-latest: true
          cache: true
 
diff --git a/.github/workflows/test-smoke.yml b/.github/workflows/test-smoke.yml
index 9cea05eee2..7c908e1822 100644
--- a/.github/workflows/test-smoke.yml
+++ b/.github/workflows/test-smoke.yml
@@ -27,10 +27,11 @@ jobs:
          node-version: '18'
          cache: 'npm'
 
-      - name: Setup Go
-        uses: actions/setup-go@v3
+      - name: Setup Go/Go+
+        uses: goplus/setup-goplus@v1.1.0
         with:
          go-version: '1.21'
+         gop-version: "main"
          check-latest: true
          cache: true
 

From 4f584a4e6d4fe768968b1284f307deeaf73a87fa Mon Sep 17 00:00:00 2001
From: nighca <nighca@live.cn>
Date: Thu, 9 Nov 2023 10:24:41 +0800
Subject: [PATCH 2/3] configure gop file icons

---
 media/goplus-file-icon-black.svg | 1 +
 media/goplus-file-icon-white.svg | 1 +
 package.json                     | 4 ++++
 3 files changed, 6 insertions(+)
 create mode 100644 media/goplus-file-icon-black.svg
 create mode 100644 media/goplus-file-icon-white.svg

diff --git a/media/goplus-file-icon-black.svg b/media/goplus-file-icon-black.svg
new file mode 100644
index 0000000000..7f57f882c1
--- /dev/null
+++ b/media/goplus-file-icon-black.svg
@@ -0,0 +1 @@
+<svg width="60" height="60" viewBox="0 -17 60 43" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="black" fill-rule="evenodd" clip-rule="evenodd" d="M8.47343 0C3.8011 0 0 3.8011 0 8.47258C0 13.1447 3.8011 16.946 8.47343 16.9462H15.1208V13.0357H8.47343C5.95756 13.0357 3.91054 10.9887 3.91054 8.47279C3.91054 5.95756 5.95756 3.91054 8.47343 3.91054H21.5083V0H8.47343ZM17.7277 10.4934V16.9246H21.6382V9.84185C21.6382 8.0448 20.1762 6.58303 18.3794 6.58303H8.47343V10.4934H17.7277ZM32.72 0C28.0479 0 24.2474 3.8011 24.2474 8.47258C24.2474 13.1447 28.0479 16.946 32.72 16.946H39.2374C43.9095 16.946 47.71 13.1449 47.71 8.47258C47.71 3.8011 43.9098 0 39.2374 0H32.72ZM32.7202 13.0355C30.2044 13.0355 28.158 10.9884 28.158 8.47258C28.158 5.95735 30.2042 3.91032 32.7202 3.91032H39.2376C41.7535 3.91032 43.7999 5.95756 43.7999 8.47258C43.7999 10.9884 41.7535 13.0355 39.2376 13.0355H32.7202ZM56.5632 3.47069L56.5496 0.0457199L53.6138 0.0573616L53.6274 3.48233L50.2032 3.49588L50.2151 6.43148L53.6401 6.4173L53.6536 9.84227L56.5892 9.83042L56.575 6.40545L60 6.39127L59.9881 3.45651L56.5632 3.47069Z"></path></svg>
\ No newline at end of file
diff --git a/media/goplus-file-icon-white.svg b/media/goplus-file-icon-white.svg
new file mode 100644
index 0000000000..8c948d834f
--- /dev/null
+++ b/media/goplus-file-icon-white.svg
@@ -0,0 +1 @@
+<svg width="60" height="60" viewBox="0 -17 60 43" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="white" fill-rule="evenodd" clip-rule="evenodd" d="M8.47343 0C3.8011 0 0 3.8011 0 8.47258C0 13.1447 3.8011 16.946 8.47343 16.9462H15.1208V13.0357H8.47343C5.95756 13.0357 3.91054 10.9887 3.91054 8.47279C3.91054 5.95756 5.95756 3.91054 8.47343 3.91054H21.5083V0H8.47343ZM17.7277 10.4934V16.9246H21.6382V9.84185C21.6382 8.0448 20.1762 6.58303 18.3794 6.58303H8.47343V10.4934H17.7277ZM32.72 0C28.0479 0 24.2474 3.8011 24.2474 8.47258C24.2474 13.1447 28.0479 16.946 32.72 16.946H39.2374C43.9095 16.946 47.71 13.1449 47.71 8.47258C47.71 3.8011 43.9098 0 39.2374 0H32.72ZM32.7202 13.0355C30.2044 13.0355 28.158 10.9884 28.158 8.47258C28.158 5.95735 30.2042 3.91032 32.7202 3.91032H39.2376C41.7535 3.91032 43.7999 5.95756 43.7999 8.47258C43.7999 10.9884 41.7535 13.0355 39.2376 13.0355H32.7202ZM56.5632 3.47069L56.5496 0.0457199L53.6138 0.0573616L53.6274 3.48233L50.2032 3.49588L50.2151 6.43148L53.6401 6.4173L53.6536 9.84227L56.5892 9.83042L56.575 6.40545L60 6.39127L59.9881 3.45651L56.5632 3.47069Z"></path></svg>
\ No newline at end of file
diff --git a/package.json b/package.json
index e66aa194ea..44211591ca 100644
--- a/package.json
+++ b/package.json
@@ -145,6 +145,10 @@
         "aliases": [
           "Goplus"
         ],
+        "icon": {
+          "light": "./media/goplus-file-icon-black.svg",
+          "dark": "./media/goplus-file-icon-white.svg"
+        },
         "configuration": "./languages/gop.language-configuration.json"
       },
       {

From 0c9d6de969db47eeed72bb9f6a745b814f300ffd Mon Sep 17 00:00:00 2001
From: nighca <nighca@live.cn>
Date: Thu, 9 Nov 2023 10:33:01 +0800
Subject: [PATCH 3/3] adjust icon size

---
 media/goplus-file-icon-black.svg | 2 +-
 media/goplus-file-icon-white.svg | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media/goplus-file-icon-black.svg b/media/goplus-file-icon-black.svg
index 7f57f882c1..c0c73115c5 100644
--- a/media/goplus-file-icon-black.svg
+++ b/media/goplus-file-icon-black.svg
@@ -1 +1 @@
-<svg width="60" height="60" viewBox="0 -17 60 43" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="black" fill-rule="evenodd" clip-rule="evenodd" d="M8.47343 0C3.8011 0 0 3.8011 0 8.47258C0 13.1447 3.8011 16.946 8.47343 16.9462H15.1208V13.0357H8.47343C5.95756 13.0357 3.91054 10.9887 3.91054 8.47279C3.91054 5.95756 5.95756 3.91054 8.47343 3.91054H21.5083V0H8.47343ZM17.7277 10.4934V16.9246H21.6382V9.84185C21.6382 8.0448 20.1762 6.58303 18.3794 6.58303H8.47343V10.4934H17.7277ZM32.72 0C28.0479 0 24.2474 3.8011 24.2474 8.47258C24.2474 13.1447 28.0479 16.946 32.72 16.946H39.2374C43.9095 16.946 47.71 13.1449 47.71 8.47258C47.71 3.8011 43.9098 0 39.2374 0H32.72ZM32.7202 13.0355C30.2044 13.0355 28.158 10.9884 28.158 8.47258C28.158 5.95735 30.2042 3.91032 32.7202 3.91032H39.2376C41.7535 3.91032 43.7999 5.95756 43.7999 8.47258C43.7999 10.9884 41.7535 13.0355 39.2376 13.0355H32.7202ZM56.5632 3.47069L56.5496 0.0457199L53.6138 0.0573616L53.6274 3.48233L50.2032 3.49588L50.2151 6.43148L53.6401 6.4173L53.6536 9.84227L56.5892 9.83042L56.575 6.40545L60 6.39127L59.9881 3.45651L56.5632 3.47069Z"></path></svg>
\ No newline at end of file
+<svg width="72" height="72" viewBox="-12 -30 72 72" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="black" fill-rule="evenodd" clip-rule="evenodd" d="M8.47343 0C3.8011 0 0 3.8011 0 8.47258C0 13.1447 3.8011 16.946 8.47343 16.9462H15.1208V13.0357H8.47343C5.95756 13.0357 3.91054 10.9887 3.91054 8.47279C3.91054 5.95756 5.95756 3.91054 8.47343 3.91054H21.5083V0H8.47343ZM17.7277 10.4934V16.9246H21.6382V9.84185C21.6382 8.0448 20.1762 6.58303 18.3794 6.58303H8.47343V10.4934H17.7277ZM32.72 0C28.0479 0 24.2474 3.8011 24.2474 8.47258C24.2474 13.1447 28.0479 16.946 32.72 16.946H39.2374C43.9095 16.946 47.71 13.1449 47.71 8.47258C47.71 3.8011 43.9098 0 39.2374 0H32.72ZM32.7202 13.0355C30.2044 13.0355 28.158 10.9884 28.158 8.47258C28.158 5.95735 30.2042 3.91032 32.7202 3.91032H39.2376C41.7535 3.91032 43.7999 5.95756 43.7999 8.47258C43.7999 10.9884 41.7535 13.0355 39.2376 13.0355H32.7202ZM56.5632 3.47069L56.5496 0.0457199L53.6138 0.0573616L53.6274 3.48233L50.2032 3.49588L50.2151 6.43148L53.6401 6.4173L53.6536 9.84227L56.5892 9.83042L56.575 6.40545L60 6.39127L59.9881 3.45651L56.5632 3.47069Z"></path></svg>
\ No newline at end of file
diff --git a/media/goplus-file-icon-white.svg b/media/goplus-file-icon-white.svg
index 8c948d834f..e640677e78 100644
--- a/media/goplus-file-icon-white.svg
+++ b/media/goplus-file-icon-white.svg
@@ -1 +1 @@
-<svg width="60" height="60" viewBox="0 -17 60 43" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="white" fill-rule="evenodd" clip-rule="evenodd" d="M8.47343 0C3.8011 0 0 3.8011 0 8.47258C0 13.1447 3.8011 16.946 8.47343 16.9462H15.1208V13.0357H8.47343C5.95756 13.0357 3.91054 10.9887 3.91054 8.47279C3.91054 5.95756 5.95756 3.91054 8.47343 3.91054H21.5083V0H8.47343ZM17.7277 10.4934V16.9246H21.6382V9.84185C21.6382 8.0448 20.1762 6.58303 18.3794 6.58303H8.47343V10.4934H17.7277ZM32.72 0C28.0479 0 24.2474 3.8011 24.2474 8.47258C24.2474 13.1447 28.0479 16.946 32.72 16.946H39.2374C43.9095 16.946 47.71 13.1449 47.71 8.47258C47.71 3.8011 43.9098 0 39.2374 0H32.72ZM32.7202 13.0355C30.2044 13.0355 28.158 10.9884 28.158 8.47258C28.158 5.95735 30.2042 3.91032 32.7202 3.91032H39.2376C41.7535 3.91032 43.7999 5.95756 43.7999 8.47258C43.7999 10.9884 41.7535 13.0355 39.2376 13.0355H32.7202ZM56.5632 3.47069L56.5496 0.0457199L53.6138 0.0573616L53.6274 3.48233L50.2032 3.49588L50.2151 6.43148L53.6401 6.4173L53.6536 9.84227L56.5892 9.83042L56.575 6.40545L60 6.39127L59.9881 3.45651L56.5632 3.47069Z"></path></svg>
\ No newline at end of file
+<svg width="72" height="72" viewBox="-12 -30 72 72" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="white" fill-rule="evenodd" clip-rule="evenodd" d="M8.47343 0C3.8011 0 0 3.8011 0 8.47258C0 13.1447 3.8011 16.946 8.47343 16.9462H15.1208V13.0357H8.47343C5.95756 13.0357 3.91054 10.9887 3.91054 8.47279C3.91054 5.95756 5.95756 3.91054 8.47343 3.91054H21.5083V0H8.47343ZM17.7277 10.4934V16.9246H21.6382V9.84185C21.6382 8.0448 20.1762 6.58303 18.3794 6.58303H8.47343V10.4934H17.7277ZM32.72 0C28.0479 0 24.2474 3.8011 24.2474 8.47258C24.2474 13.1447 28.0479 16.946 32.72 16.946H39.2374C43.9095 16.946 47.71 13.1449 47.71 8.47258C47.71 3.8011 43.9098 0 39.2374 0H32.72ZM32.7202 13.0355C30.2044 13.0355 28.158 10.9884 28.158 8.47258C28.158 5.95735 30.2042 3.91032 32.7202 3.91032H39.2376C41.7535 3.91032 43.7999 5.95756 43.7999 8.47258C43.7999 10.9884 41.7535 13.0355 39.2376 13.0355H32.7202ZM56.5632 3.47069L56.5496 0.0457199L53.6138 0.0573616L53.6274 3.48233L50.2032 3.49588L50.2151 6.43148L53.6401 6.4173L53.6536 9.84227L56.5892 9.83042L56.575 6.40545L60 6.39127L59.9881 3.45651L56.5632 3.47069Z"></path></svg>
\ No newline at end of file