Start the 'indexedVersion' at -1 to prevent an issue where a document…

… may skip the 'indexing' process.

server/src/UC/document.ts

@@ -62,7 +62,7 @@ function removeChildren(scope: UCStructSymbol) {
 }
 
 export type DocumentParseData = {
-    context: ProgramContext;
+    context: ProgramContext | undefined;
     parser: UCParser;
 };
 
@@ -77,7 +77,7 @@ export class UCDocument {
     public readonly uri: DocumentUri;
 
     /** The current indexed TextDocument's version as reported by the client. */
-    public indexedVersion = 0;
+    public indexedVersion = -1;
 
     // TODO: Displace this with a DiagnosticCollection visitor.
     public nodes: IDiagnosticNode[] = [];

server/src/UC/indexer.ts

@@ -75,11 +75,17 @@ export const documentsCodeIndexed$ = new Subject<UCDocument[]>();
 export function indexDocument(document: UCDocument, text?: string): void {
     const buildStart = performance.now();
     let buildTime: number;
+    let indexedVersion: number | undefined;
 
     if (typeof text === 'undefined') {
         // Let's fetch the text from the file system, but first see if we have an active text document (this ensures we retrieve the latest revision)
         const textDocument = ActiveTextDocuments.get(document.uri);
-        text = textDocument?.getText() ?? readTextByURI(document.uri);
+        if (textDocument) {
+            text = textDocument.getText();
+            indexedVersion = textDocument.version;
+        } else {
+            text = readTextByURI(document.uri);
+        }
     }
 
     try {
@@ -98,6 +104,7 @@ export function indexDocument(document: UCDocument, text?: string): void {
         const indexer = new DocumentSymbolIndexer(document);
         // We set this here to prevent any re-triggering within the following indexing process.
         document.hasBeenIndexed = true;
+        if (indexedVersion) document.indexedVersion = indexedVersion;
         document.accept(indexer);
     } catch (err) {
         console.error(

server/src/server.ts

@@ -54,6 +54,7 @@ import {
     createPackage,
     createPackageByDir,
     documentBuilt$,
+    documentIndexed$,
     documentsCodeIndexed$,
     enumerateDocuments,
     getDocumentById,
@@ -432,6 +433,7 @@ connection.onInitialized((params) => {
                     if (process.env.NODE_ENV === 'development') {
                         connection.console.log(`Document "${document.fileName}" is already indexed.`);
                     }
+
                     return;
                 }
 
@@ -503,7 +505,7 @@ connection.onInitialized((params) => {
                     queueIndexDocument(globalUci);
                 }
 
-                // Weird, even if when we have "zero" active documents, this will array is filled?
+                // Weird, even if when we have "zero" active documents, this array is filled?
                 const activeDocuments = ActiveTextDocuments
                     .all()
                     .map(doc => getDocumentByURI(doc.uri))
@@ -735,11 +737,8 @@ async function registerPresetsWorkspace(generation: UCGeneration, licensee: UELi
         };
     }
 
-    // Always include the 'Shared' presets
     const presetsPath = path.join(__dirname, 'presets');
-    const folders: WorkspaceFolder[] = [
-        pathToWorkspaceFolder(path.join(presetsPath, 'Shared'))
-    ];
+    const folders: WorkspaceFolder[] = [];
 
     switch (generation) {
         case UCGeneration.UC1:
@@ -762,6 +761,9 @@ async function registerPresetsWorkspace(generation: UCGeneration, licensee: UELi
             break;
     }
 
+    // Always include the 'Shared' presets, included as last so that they cannot not precede any of the licensee or generation specific documents of the same name.
+    folders.push(pathToWorkspaceFolder(path.join(presetsPath, 'Shared')));
+
     // blob search all the files in the presets folder!
     const workspaceFiles = await getWorkspaceFiles(folders, 'presets');