Merge pull request #241 from timo-klarshift/issue-118-null-literals

Issue 118 null literals

Author: JPinkney

src/languageservice/parser/yamlParser07.ts

@@ -117,7 +117,7 @@ function recursivelyBuildAst(parent: ASTNode, node: Yaml.YAMLNode): ASTNode {
 
             switch (type) {
                 case Yaml.ScalarType.null: {
-                    return new StringASTNodeImpl(parent, instance.startPosition, instance.endPosition - instance.startPosition);
+                    return new NullASTNodeImpl(parent, node.startPosition, node.endPosition - node.startPosition);
                 }
                 case Yaml.ScalarType.bool: {
                     return new BooleanASTNodeImpl(parent, Yaml.parseYamlBoolean(value), node.startPosition, node.endPosition - node.startPosition);

test/documentSymbols.test.ts

@@ -80,7 +80,7 @@ suite('Document Symbols Tests', () => {
             assert.equal(symbols.length, 1);
             assert.deepEqual(
                 symbols[0],
-                createExpectedSymbolInformation('apiVersion', 15, undefined, TEST_URI, 0, 0, 0, 16)
+                createExpectedSymbolInformation('apiVersion', SymbolKind.Variable, undefined, TEST_URI, 0, 0, 0, 16)
             );
         });
 
@@ -90,7 +90,7 @@ suite('Document Symbols Tests', () => {
             assert.equal(symbols.length, 1);
             assert.deepEqual(
                 symbols[0],
-                createExpectedSymbolInformation('items', 18, undefined, TEST_URI, 0, 0, 2, 8)
+                createExpectedSymbolInformation('items', SymbolKind.Array, undefined, TEST_URI, 0, 0, 2, 8)
             );
         });
 
@@ -221,7 +221,7 @@ suite('Document Symbols Tests', () => {
             assert.equal(symbols.length, 1);
             assert.deepEqual(
                 symbols[0],
-                createExpectedDocumentSymbol('apiVersion', SymbolKind.String, 0, 0, 0, 16, 0, 0, 0, 10)
+                createExpectedDocumentSymbol('apiVersion', SymbolKind.Variable, 0, 0, 0, 16, 0, 0, 0, 10)
             );
         });
 

test/schemaValidation.test.ts

@@ -96,14 +96,6 @@ suite('Validation Tests', () => {
                 }).then(done, done);
             });
 
-            it('Null scalar value should be treated as string', done => {
-                const content = 'cwd: Null';
-                const validator = parseSetup(content);
-                validator.then(function (result) {
-                    assert.equal(result.length, 0);
-                }).then(done, done);
-            });
-
             it('Anchor should not not error', done => {
                 const content = 'default: &DEFAULT\n  name: Anchor\nanchor_test:\n  <<: *DEFAULT';
                 const validator = parseSetup(content);
@@ -430,5 +422,55 @@ suite('Validation Tests', () => {
                 }).then(done, done);
             });
         });
+
+        // https://github.com/redhat-developer/yaml-language-server/issues/118
+        describe('Null literals', () => {
+            ['NULL', 'Null', 'null', '~', ''].forEach(content => {
+                it(`Test type null is parsed from [${content}]`, done => {
+                    const schema = {
+                        type: 'null'
+                    };
+                    languageService.configure({
+                        schemas: [{
+                            uri: 'file://test.yaml',
+                            fileMatch: ['*.yaml', '*.yml'],
+                            schema
+                        }],
+                        validate: true
+                    });
+                    const validator = parseSetup(content);
+                    validator.then(function (result) {
+                        assert.equal(result.length, 0);
+                    }).then(done, done);
+                });
+            });
+
+            it('Test type null is working correctly in array', done => {
+                const schema = {
+                    properties: {
+                        values: {
+                            type: 'array',
+                            items: {
+                                type: 'null'
+                            }
+                        }
+                    },
+                    required: ['values']
+                };
+                languageService.configure({
+                    schemas: [{
+                        uri: 'file://test.yaml',
+                        fileMatch: ['*.yaml', '*.yml'],
+                        schema
+                    }],
+                    validate: true
+                });
+                const content = 'values: [Null, NULL, null, ~,]';
+                const validator = parseSetup(content);
+                validator.then(function (result) {
+                    assert.equal(result.length, 0);
+                }).then(done, done);
+            });
+        });
     });
 });