From 675669040186f694489be3ed29a0ff193dc06af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=B5=E3=81=81?= <yuki@yuki0311.com>
Date: Tue, 6 Feb 2024 14:13:15 +0900
Subject: [PATCH] update vscode settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: ふぁ <yuki@yuki0311.com>
---
 .vscode/launch.json   |  8 ++++----
 .vscode/settings.json | 12 +++++++++++-
 .vscode/tasks.json    |  9 +++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7b7bf00..1df138e 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -3,7 +3,7 @@
   "configurations": [
     {
       "name": "Python: 現在のファイル",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "program": "${file}",
       "console": "integratedTerminal",
@@ -11,7 +11,7 @@
     },
     {
       "name": "build",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "program": "tools/build.py",
       "console": "integratedTerminal",
@@ -19,7 +19,7 @@
     },
     {
       "name": "test",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "program": "test/python/test_serialize.py",
       "console": "integratedTerminal",
@@ -30,4 +30,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index a19d7b4..0a0727a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,5 +5,15 @@
   "yaml.hover": true,
   "yaml.schemas": {
     "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.0/schema.json": "src/**/*.yaml"
+  },
+  "[yaml]": {
+    "editor.defaultFormatter": "redhat.vscode-yaml"
+  },
+  // "python.analysis.typeCheckingMode": "basic",
+  "[python]": {
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit",
+      "source.fixAll": "explicit",
+    },
   }
-}
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index ce35833..31a2cb1 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -8,7 +8,7 @@
         "command": [
           "source .venv/bin/activate;",
           "python3 tools/build.py;",
-          "java -jar openapi-generator-cli.jar generate -c test/python/openapi-generator-config.yaml -g python;",
+          "java -jar openapi-generator-cli.jar generate -c test/python/openapi-generator-config.yaml -g python-pydantic-v1;",
           "python3 test/python/replace.py;",
           "python3 -m pip install ./python_generated;"
         ]
@@ -17,7 +17,8 @@
         "command": [
           ".venv/Scripts/activate;",
           "python tools/build.py;",
-          "java -jar openapi-generator-cli.jar generate -c test/python/openapi-generator-config.yaml -g python;",
+          "scoop reset temurin11-jdk;",
+          "java -jar openapi-generator-cli.jar generate -c test/python/openapi-generator-config.yaml -g python-pydantic-v1;",
           "python test/python/replace.py;",
           "python -m pip install ./python_generated;"
         ]
@@ -33,14 +34,14 @@
         "command": [
           "python3 -m venv .venv;",
           ".venv/bin/python3 -m pip install -r requirements.txt;",
-          "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.1.0/openapi-generator-cli-7.1.0.jar -O openapi-generator-cli.jar;"
+          "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.2.0/openapi-generator-cli-7.2.0.jar -O openapi-generator-cli.jar;"
         ]
       },
       "windows": {
         "command": [
           "python -m venv .venv;",
           ".venv/Scripts/python -m pip install -r requirements.txt;",
-          "Invoke-WebRequest https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.1.0/openapi-generator-cli-7.1.0.jar -OutFile openapi-generator-cli.jar;"
+          "Invoke-WebRequest https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.2.0/openapi-generator-cli-7.2.0.jar -OutFile openapi-generator-cli.jar;"
         ]
       }
     }