From cd8fad25133164b3d9c1dc3a79a956324009c2b8 Mon Sep 17 00:00:00 2001 From: kavink98 Date: Wed, 7 Dec 2022 18:32:04 +0530 Subject: [PATCH 1/6] gitignore updated for vscode --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 42983f369c..c34bb0eec8 100644 --- a/.gitignore +++ b/.gitignore @@ -142,6 +142,9 @@ gradle-app.setting # JDT-specific (Eclipse Java Development Tools) .classpath +# VSCode +.vscode + # End of https://www.toptal.com/developers/gitignore/api/netbeans,intellij,java,gradle,eclipse application/db/ config.json From 9c3802173ed6e57a1a61e272b3323dc8264b6389 Mon Sep 17 00:00:00 2001 From: kavink98 Date: Wed, 7 Dec 2022 19:07:49 +0530 Subject: [PATCH 2/6] Moved the file to below line 145 --- .gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c34bb0eec8..7ed47f010f 100644 --- a/.gitignore +++ b/.gitignore @@ -142,9 +142,6 @@ gradle-app.setting # JDT-specific (Eclipse Java Development Tools) .classpath -# VSCode -.vscode - # End of https://www.toptal.com/developers/gitignore/api/netbeans,intellij,java,gradle,eclipse application/db/ config.json @@ -163,3 +160,6 @@ logviewer/pnpm-lock.yaml logviewer/webpack.config.js logviewer/webpack.generated.js .DS_Store + +# VSCode +.vscode \ No newline at end of file From c69a1ba748af141c1c3267578d68b9fc6536ec07 Mon Sep 17 00:00:00 2001 From: kavink98 Date: Wed, 7 Dec 2022 19:10:36 +0530 Subject: [PATCH 3/6] Removed header comment --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7ed47f010f..3396a231b2 100644 --- a/.gitignore +++ b/.gitignore @@ -160,6 +160,4 @@ logviewer/pnpm-lock.yaml logviewer/webpack.config.js logviewer/webpack.generated.js .DS_Store - -# VSCode .vscode \ No newline at end of file From 38fb87479d12260f4ac2344d756354e06f2462f7 Mon Sep 17 00:00:00 2001 From: kavink98 Date: Thu, 8 Dec 2022 01:12:06 +0530 Subject: [PATCH 4/6] Adding settings and extensions for VSCode --- .vscode/extensions.json | 8 ++++++++ .vscode/settings.json | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000000..139ea37f9c --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,8 @@ +{ + "recommendations": [ + "vscjava.vscode-gradle", + "ms-vscode-remote.remote-containers", + "github.vscode-pull-request-github", + "vscjava.vscode-java-pack" + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..5f19eba23c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + //Configure the JDK to Java 18 in settings + "java.compile.nullAnalysis.mode": "disabled", + "java.format.settings.url": "meta/formatting/google-style-eclipse.xml", + "editor.formatOnSave": true, + "editor.formatOnPaste": true, + "java.format.enabled": true, +} \ No newline at end of file From 880b12582c47137d602a6da564f6aba2a1abd874 Mon Sep 17 00:00:00 2001 From: kavink98 Date: Thu, 8 Dec 2022 01:12:26 +0530 Subject: [PATCH 5/6] gitignore as per https://github.com/github/gitignore --- .gitignore | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3396a231b2..72e35328b6 100644 --- a/.gitignore +++ b/.gitignore @@ -160,4 +160,15 @@ logviewer/pnpm-lock.yaml logviewer/webpack.config.js logviewer/webpack.generated.js .DS_Store -.vscode \ No newline at end of file + +# VisualStudioCode +.vscode/* +!.vscode/settings.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix \ No newline at end of file From 31676191838c5b5b6d761394838f0d367445b110 Mon Sep 17 00:00:00 2001 From: kavink98 Date: Thu, 8 Dec 2022 14:00:11 +0530 Subject: [PATCH 6/6] Synced devcontainer and local settings --- .devcontainer/devcontainer.json | 12 +++++++----- .vscode/extensions.json | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8d17ee2cb9..afe5444f91 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -19,13 +19,15 @@ "extensions": [ "vscjava.vscode-java-pack", "vscjava.vscode-gradle", - "alexcvzz.vscode-sqlite", - "richardwillis.vscode-spotless-gradle" + "alexcvzz.vscode-sqlite" ], "settings": { "[java]": { - "spotlessGradle.format.enable": true, - "editor.defaultFormatter": "richardwillis.vscode-spotless-gradle" + "java.compile.nullAnalysis.mode": "disabled", + "java.format.settings.url": "meta/formatting/google-style-eclipse.xml", + "editor.formatOnSave": true, + "editor.formatOnPaste": true, + "java.format.enabled": true } } } @@ -33,4 +35,4 @@ "postCreateCommand": { "config": "cp application/config.json.template application/config.json" } -} +} \ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 139ea37f9c..44d6e10323 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,8 +1,8 @@ { "recommendations": [ "vscjava.vscode-gradle", - "ms-vscode-remote.remote-containers", "github.vscode-pull-request-github", - "vscjava.vscode-java-pack" + "vscjava.vscode-java-pack", + "alexcvzz.vscode-sqlite" ] } \ No newline at end of file