changed parser when last line is empty or null (#625)

* changed parser when lastline is empty or null

* getting text tokens using Lexer

* slice last two tokens from array

* check whether last line empty or not using textdocument'

Author: msivasubramaniaan

src/languageservice/parser/yaml-documents.ts

@@ -250,7 +250,7 @@ export class YamlDocuments {
       if (addRootObject && !/\S/.test(text)) {
         text = `{${text}}`;
       }
-      const doc = parseYAML(text, parserOptions);
+      const doc = parseYAML(text, parserOptions, document);
       cacheEntry.document = doc;
       cacheEntry.version = document.version;
       cacheEntry.parserOptions = parserOptions;

src/languageservice/parser/yamlParser07.ts

@@ -8,6 +8,8 @@
 import { Parser, Composer, Document, LineCounter, ParseOptions, DocumentOptions, SchemaOptions } from 'yaml';
 import { YAMLDocument, SingleYAMLDocument } from './yaml-documents';
 import { getCustomTags } from './custom-tag-provider';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { TextBuffer } from '../utils/textBuffer';
 
 export { YAMLDocument, SingleYAMLDocument };
 
@@ -25,7 +27,7 @@ export const defaultOptions: ParserOptions = {
  * returns YAML AST nodes, which are then formatted
  * for consumption via the language server.
  */
-export function parse(text: string, parserOptions: ParserOptions = defaultOptions): YAMLDocument {
+export function parse(text: string, parserOptions: ParserOptions = defaultOptions, document?: TextDocument): YAMLDocument {
   const options: ParseOptions & DocumentOptions & SchemaOptions = {
     strict: false,
     customTags: getCustomTags(parserOptions.customTags),
@@ -34,7 +36,14 @@ export function parse(text: string, parserOptions: ParserOptions = defaultOption
   };
   const composer = new Composer(options);
   const lineCounter = new LineCounter();
-  const parser = new Parser(lineCounter.addNewLine);
+  let isLastLineEmpty = false;
+  if (document) {
+    const textBuffer = new TextBuffer(document);
+    const position = textBuffer.getPosition(text.length);
+    const lineContent = textBuffer.getLineContent(position.line);
+    isLastLineEmpty = lineContent.trim().length === 0;
+  }
+  const parser = isLastLineEmpty ? new Parser() : new Parser(lineCounter.addNewLine);
   const tokens = parser.parse(text);
   const tokensArr = Array.from(tokens);
   const docs = composer.compose(tokensArr, true, text.length);

test/documentSymbols.test.ts

@@ -273,8 +273,7 @@ describe('Document Symbols Tests', () => {
               ? *root
               :
                 style:
-                  height: 41
-            `;
+                  height: 41`;
 
       const symbols = parseHierarchicalSetup(content);
 

test/hover.test.ts

@@ -426,6 +426,31 @@ storage:
       );
     });
 
+    it('Hover on property next value on null', async () => {
+      languageService.addSchema(SCHEMA_ID, {
+        type: 'object',
+        properties: {
+          childObject: {
+            type: 'object',
+            description: 'childObject description',
+            properties: {
+              prop: {
+                type: 'string',
+                description: 'should return this description',
+              },
+            },
+          },
+        },
+      });
+      const content = 'childObject:\r\n  prop:\r\n  ';
+      const result = await parseSetup(content, 16);
+      assert.strictEqual(MarkupContent.is(result.contents), true);
+      assert.strictEqual(
+        (result.contents as MarkupContent).value,
+        `should return this description\n\nSource: [${SCHEMA_ID}](file:///${SCHEMA_ID})`
+      );
+    });
+
     it('should work with bad schema', async () => {
       const doc = setupSchemaIDTextDocument('foo:\n bar', 'bad-schema.yaml');
       yamlSettings.documents = new TextDocumentTestManager();