From 7c19c5df85fb7f972eb03dbb0601be1161e1b271 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 2 Aug 2017 09:52:53 -0700 Subject: [PATCH] Fix small spacing issue in snippet generator --- .../snippets/SchemaBasedSnippetGenerator.java | 2 +- .../bosh/SchemaBasedSnippetGeneratorTest.java | 32 ++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/snippets/SchemaBasedSnippetGenerator.java b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/snippets/SchemaBasedSnippetGenerator.java index 746326fc7..31587b244 100644 --- a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/snippets/SchemaBasedSnippetGenerator.java +++ b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/snippets/SchemaBasedSnippetGenerator.java @@ -141,7 +141,7 @@ public class SchemaBasedSnippetGenerator implements TypeBasedSnippetProvider { generateNestedSnippet(true, typeUtil.getDomainType(type), builder, indent, nestingLimit); } else { //Treat like atomic //ready to enter whatever on the same line - builder.text(" "); + builder.ensureSpace(); builder.placeHolder(); } } diff --git a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/SchemaBasedSnippetGeneratorTest.java b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/SchemaBasedSnippetGeneratorTest.java index b743995ec..52d517aec 100644 --- a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/SchemaBasedSnippetGeneratorTest.java +++ b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/SchemaBasedSnippetGeneratorTest.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.springframework.ide.vscode.bosh; +import static org.junit.Assert.assertEquals; + import org.junit.Test; import org.springframework.ide.vscode.bosh.snippets.SchemaBasedSnippetGenerator; import org.springframework.ide.vscode.commons.languageserver.util.SnippetBuilder; @@ -30,7 +32,35 @@ public class SchemaBasedSnippetGeneratorTest { @Test public void toplevelSnippet() throws Exception { YType v2Schema = typeUtil.inferMoreSpecificType(schema.getTopLevelType(), DynamicSchemaContext.NULL); - System.out.println(generator.getSnippets(v2Schema).iterator().next()); + assertEquals( + "name: $1\n" + + "releases:\n" + + "- name: $2\n" + + " version: $3\n" + + "stemcells:\n" + + "- alias: $4\n" + + " version: $5\n" + + "update:\n" + + " canaries: $6\n" + + " max_in_flight: $7\n" + + " canary_watch_time: $8\n" + + " update_watch_time: $9\n" + + "instance_groups:\n" + + "- name: $10\n" + + " azs:\n" + + " - $11\n" + + " instances: $12\n" + + " jobs:\n" + + " - name: $13\n" + + " release: $14\n" + + " vm_type: $15\n" + + " stemcell: $16\n" + + " networks:\n" + + " - name: $17" + , + generator.getSnippets(v2Schema).iterator().next().getSnippet() + ); + System.out.println(); } }