From e8e748fc5c381ac882a7555b560dc00c4b71c5d5 Mon Sep 17 00:00:00 2001
From: Yevhen Vydolob <yvydolob@redhat.com>
Date: Tue, 14 Jul 2020 10:23:05 +0300
Subject: [PATCH] Insert empty string instead of null for string array
 completion

Signed-off-by: Yevhen Vydolob <yvydolob@redhat.com>
---
 .../services/yamlCompletion.ts                |  2 +-
 test/autoCompletion6.test.ts                  | 51 +++++++++++++++++++
 test/fixtures/testStringArray.json            | 12 +++++
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 test/autoCompletion6.test.ts
 create mode 100644 test/fixtures/testStringArray.json

diff --git a/src/languageservice/services/yamlCompletion.ts b/src/languageservice/services/yamlCompletion.ts
index a58dbc94..061c1b4d 100644
--- a/src/languageservice/services/yamlCompletion.ts
+++ b/src/languageservice/services/yamlCompletion.ts
@@ -652,7 +652,7 @@ export class YAMLCompletion extends JSONCompletion {
                 insertText = `\${${insertIndex++}:0}`;
                 break;
             case 'string':
-                insertText = `\${${insertIndex++}:null}`;
+                insertText = `\${${insertIndex++}:""}`;
                 break;
             case 'object':
                 const objectInsertResult = this.getInsertTextForObject(schema, separatorAfter, `${indent}\t`, insertIndex++);
diff --git a/test/autoCompletion6.test.ts b/test/autoCompletion6.test.ts
new file mode 100644
index 00000000..6428dff8
--- /dev/null
+++ b/test/autoCompletion6.test.ts
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Red Hat. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { TextDocument } from 'vscode-languageserver';
+import { getLanguageService } from '../src/languageservice/yamlLanguageService';
+import { toFsPath, schemaRequestService, workspaceContext } from './utils/testHelper';
+import assert = require('assert');
+import path = require('path');
+
+const languageService = getLanguageService(schemaRequestService, workspaceContext, [], null);
+
+const languageSettings = {
+    schemas: [],
+    completion: true
+};
+
+const uri = toFsPath(path.join(__dirname, './fixtures/testStringArray.json'));
+const fileMatch = ['*.yml', '*.yaml'];
+languageSettings.schemas.push({ uri, fileMatch: fileMatch });
+languageService.configure(languageSettings);
+
+suite('Auto Completion Tests', () => {
+
+
+    describe('yamlCompletion with string array ', function () {
+
+        describe('doComplete', function () {
+
+            function setup (content: string) {
+                return TextDocument.create('file://~/Desktop/vscode-k8s/test.yaml', 'yaml', 0, content);
+            }
+
+            function parseSetup (content: string, position) {
+                const testTextDocument = setup(content);
+                return languageService.doComplete(testTextDocument, testTextDocument.positionAt(position), false);
+            }
+
+            it('Completion should insert ""', done => {
+                const content = 'fooBa';
+                const completion = parseSetup(content, content.lastIndexOf('Ba') + 2);
+                completion.then(function (result) {
+                    assert.strictEqual('fooBar:\n\t- ${1:""}', result.items[0].insertText);
+                }).then(done, done);
+            });
+
+        });
+    });
+});
+
diff --git a/test/fixtures/testStringArray.json b/test/fixtures/testStringArray.json
new file mode 100644
index 00000000..f91f419e
--- /dev/null
+++ b/test/fixtures/testStringArray.json
@@ -0,0 +1,12 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "properties": {
+        "fooBar": {
+            "items": {
+                "type": "string"
+            },
+            "type": "array"
+        }
+    },
+    "type": "object"
+}