From 48097295d415f18de67be812aed12847c71f3ec3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 15 Mar 2019 11:37:10 +0100 Subject: [PATCH] Polish "Add gitignore for VS Code" Closes gh-864 --- .../generator/spring/scm/git/GitIgnore.java | 12 +++++------- .../scm/git/GitProjectGenerationConfiguration.java | 2 +- .../git/GitProjectGenerationConfigurationTests.java | 3 +-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitIgnore.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitIgnore.java index 9a3c615e..c72385c6 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitIgnore.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitIgnore.java @@ -39,22 +39,20 @@ public class GitIgnore { private final GitIgnoreSection netBeans = new GitIgnoreSection("NetBeans"); - private final GitIgnoreSection visualStudioCode = new GitIgnoreSection( - "Visual Studio Code"); + private final GitIgnoreSection vscode = new GitIgnoreSection("VS Code"); public void write(PrintWriter writer) throws IOException { this.general.write(writer); this.sts.write(writer); this.intellijIdea.write(writer); this.netBeans.write(writer); - this.visualStudioCode.write(writer); + this.vscode.write(writer); } public boolean isEmpty() { return this.general.getItems().isEmpty() && this.sts.getItems().isEmpty() && this.intellijIdea.getItems().isEmpty() - && this.netBeans.getItems().isEmpty() - && this.visualStudioCode.getItems().isEmpty(); + && this.netBeans.getItems().isEmpty() && this.vscode.getItems().isEmpty(); } public GitIgnoreSection getGeneral() { @@ -73,8 +71,8 @@ public class GitIgnore { return this.netBeans; } - public GitIgnoreSection getVisualStudioCode() { - return this.visualStudioCode; + public GitIgnoreSection getVscode() { + return this.vscode; } /** diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfiguration.java index e80bd65f..ee5112b4 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfiguration.java @@ -72,7 +72,7 @@ public class GitProjectGenerationConfiguration { gitIgnore.getIntellijIdea().add(".idea", "*.iws", "*.iml", "*.ipr"); gitIgnore.getNetBeans().add("/nbproject/private/", "/nbbuild/", "/dist/", "/nbdist/", "/.nb-gradle/"); - gitIgnore.getVisualStudioCode().add(".vscode/"); + gitIgnore.getVscode().add(".vscode/"); return gitIgnore; } diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java index 7dd911ff..343dac4a 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java @@ -61,8 +61,7 @@ class GitProjectGenerationConfigurationTests { ProjectDescription description = new ProjectDescription(); description.setBuildSystem(new GradleBuildSystem()); assertThat(generateGitIgnore(description)).contains("### STS ###", - "### IntelliJ IDEA ###", "### NetBeans ###", - "### Visual Studio Code ###"); + "### IntelliJ IDEA ###", "### NetBeans ###", "### VS Code ###"); } @Test