From 2fdd176dd6ca5dc9122791f4c1db556d4b5a2f4c Mon Sep 17 00:00:00 2001
From: John <JohnBreaux@my.unt.edu>
Date: Sun, 24 Apr 2022 02:34:03 -0700
Subject: [PATCH] createContextString: Improve formatting somewhat

---
 src/commands/text.ts | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/commands/text.ts b/src/commands/text.ts
index 6c0cae2..7cf5306 100755
--- a/src/commands/text.ts
+++ b/src/commands/text.ts
@@ -165,26 +165,17 @@ function createContextString(context: pl.LexNode[], line: number): string {
     }
 
     let contextString: string = `Line ${line + 1}`; // 1 based
-
+    // Print the current line
     if (context[0].token && context[0].token.attr) {
-        let tokenTypeString: string = ` ${context[0].token.type.toString()}`;
-        contextString += `:${tokenTypeString !== 'INDENT'?tokenTypeString:" "
+        let tokenTypeString: string = `${context[0].token.type.toString()}`;
+        contextString += `: ${tokenTypeString !== 'INDENT'?tokenTypeString:""
         } ${context[0].token.attr.toString()}`;
     }
 
     for (let i: number = 1; i < context.length; i++) {
         const node: pl.LexNode = context[i];
         const inside: string = "in";
-        if (node.label === 'root') {
-            // root
-            if (vscode.window.activeTextEditor?.document.uri) {
-                contextString += ` ${inside} ${vscode.workspace.asRelativePath(vscode.window.activeTextEditor?.document.uri)}`;
-            } else {
-                contextString += ` ${inside} the Document`;
-            }
-            continue;
-        }
-
+        // Node contains information relevant to the current line
         if (node.token && node.token.type !== pl.PylexSymbol.EMPTY &&
             node.token.type !== pl.PylexSymbol.INDENT) {
             contextString += ` ${inside} ${node.token.type.toString()}`;
@@ -192,6 +183,16 @@ function createContextString(context: pl.LexNode[], line: number): string {
                 contextString += ` ${node.token.attr.toString()}`;
             }
         }
+        // Node is the document root
+        if (node.label === 'root') {
+            // Append the name (relative path) of the document in the workspace
+            if (vscode.window.activeTextEditor?.document.uri) {
+                contextString += ` ${inside} ${vscode.workspace.asRelativePath(vscode.window.activeTextEditor?.document.uri)}`;
+            } else {
+                contextString += ` ${inside} the Document`;
+            }
+            continue;
+        }
     }
 
     return contextString;