Maintain quotes for boolean values in defaultSnippets

redhat-developer · Feb 5, 2020 · 85a3131 · 85a3131
1 parent 189621c
commit 85a3131
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 3 deletions.
diff --git a/src/languageservice/services/yamlCompletion.ts b/src/languageservice/services/yamlCompletion.ts
@@ -495,6 +495,9 @@ export class YAMLCompletion extends JSONCompletion {
                 if (value[0] === '^') {
                     return value.substr(1);
                 }
+                if (value === 'true' || value === 'false') {
+                    return `\"${value}\"`;
+                }
             }
             return value;
         };

diff --git a/test/defaultSnippets.test.ts b/test/defaultSnippets.test.ts
@@ -150,7 +150,7 @@ suite('Default Snippet Tests', () => {
                 const content = 'lon  ';
                 const completion = parseSetup(content, 3);
                 completion.then(function (result) {
-                    assert.equal(result.items.length, 6); // This is just checking the total number of snippets in the defaultSnippets.json
+                    assert.equal(result.items.length, 8); // This is just checking the total number of snippets in the defaultSnippets.json
                     assert.equal(result.items[4].label, 'longSnippet');
                     // tslint:disable-next-line:max-line-length
                     assert.equal(result.items[4].insertText, 'longSnippet:\n  name: $1\n  taskRef: \n    name: apply-manifests  \n  resources: \n    inputs:       \n      - name: source\n        resource: $3          \n  params:     \n    - name: manifest_dir\n      value: $2    ');
@@ -161,7 +161,7 @@ suite('Default Snippet Tests', () => {
                 const content = 'arrayArrayS  ';
                 const completion = parseSetup(content, 11);
                 completion.then(function (result) {
-                    assert.equal(result.items.length, 6); // This is just checking the total number of snippets in the defaultSnippets.json
+                    assert.equal(result.items.length, 8); // This is just checking the total number of snippets in the defaultSnippets.json
                     assert.equal(result.items[5].label, 'arrayArraySnippet');
                     // tslint:disable-next-line:max-line-length
                     assert.equal(result.items[5].insertText, 'arrayArraySnippet:\n  apple:         \n    - - name: source\n        resource: $3      ');
@@ -189,5 +189,27 @@ suite('Default Snippet Tests', () => {
                     assert.equal(result.items[0].insertText, 'apple:     \n  - - name: source\n      resource: $3');
                 }).then(done, done);
             });
+
+            it('Test string with boolean in string should insert string', done => {
+                const content = 'simpleBooleanString: ';
+                const completion = parseSetup(content, 21);
+                completion.then(function (result) {
+                    assert.equal(result.items.length, 1);
+                    assert.equal(result.items[0].label, 'Simple boolean string');
+                    // tslint:disable-next-line:max-line-length
+                    assert.equal(result.items[0].insertText, '\n  test: \"true\"');
+                }).then(done, done);
+            });
+
+            it('Test string with boolean NOT in string should insert boolean', done => {
+                const content = 'simpleBoolean: ';
+                const completion = parseSetup(content, 15);
+                completion.then(function (result) {
+                    assert.equal(result.items.length, 1);
+                    assert.equal(result.items[0].label, 'Simple string');
+                    // tslint:disable-next-line:max-line-length
+                    assert.equal(result.items[0].insertText, '\n  test: true');
+                }).then(done, done);
+            });
         });
     });
diff --git a/test/fixtures/defaultSnippets.json b/test/fixtures/defaultSnippets.json
@@ -96,7 +96,31 @@
                             ]
                           ]
                     }
-                  }
+                }
+            ]
+        },
+        "simpleBooleanString": {
+            "type": "object",
+            "defaultSnippets": [
+                {
+                    "label": "Simple boolean string",
+                    "description": "Simple boolean string insert",
+                    "body": {
+                          "test": "true"
+                    }
+                }
+            ]
+        },
+        "simpleBoolean": {
+            "type": "object",
+            "defaultSnippets": [
+                {
+                    "label": "Simple string",
+                    "description": "Simple string insert",
+                    "body": {
+                          "test": true
+                    }
+                }
             ]
         }
     }