Fix HTML/YML server crash issue (#988)

src/client/PortalWebView.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from "vscode";
 import * as path from "path";
-import { searchPortalConfigFolder } from "../common/PortalConfigFinder";
+import { searchPortalConfigFolder } from "../common/utilities/PathFinderUtil";
 
 /**
  * Displays Portal html webpage preview
@@ -130,7 +130,7 @@ export class PortalWebView {
         if (uri) {
             // Add bootstrap.min.css
             let url = webview.asWebviewUri(
-                vscode.Uri.joinPath( uri as vscode.Uri, "web-files", "bootstrap.min.css")
+                vscode.Uri.joinPath(uri as vscode.Uri, "web-files", "bootstrap.min.css")
             );
             const bootstrap = `<link href="${url}" rel="stylesheet" />`;
             html += bootstrap;

src/client/extension.ts

@@ -21,7 +21,6 @@ import {
     TransportKind,
     WorkspaceFolder,
 } from "vscode-languageclient/node";
-import { getPortalsOrgURLs, workspaceContainsPortalConfigFolder } from "../common/PortalConfigFinder";
 import {
     activateDebugger,
     deactivateDebugger,
@@ -41,6 +40,8 @@ import { ActiveOrgOutput } from "./pac/PacTypes";
 import { telemetryEventNames } from "./telemetry/TelemetryEventNames";
 import { IArtemisAPIOrgResponse } from "../common/services/Interfaces";
 import { ArtemisService } from "../common/services/ArtemisService";
+import { workspaceContainsPortalConfigFolder } from "../common/utilities/PathFinderUtil";
+import { getPortalsOrgURLs } from "../common/utilities/WorkspaceInfoFinderUtil";
 
 let client: LanguageClient;
 let _context: vscode.ExtensionContext;

src/common/PortalConfigFinder.ts → src/common/utilities/PathFinderUtil.ts

@@ -10,8 +10,6 @@ import { URL } from 'url';
 import * as path from 'path';
 import * as fs from 'fs';
 import { glob } from 'glob';
-import { sendTelemetryEvent} from "../client/power-pages/telemetry";
-import { ITelemetry } from "../client/telemetry/ITelemetry";
 
 const portalConfigFolderName = '.portalconfig';
 
@@ -72,30 +70,3 @@ function isSibling(file: string): URL | null {
     }
     return null;
 }
-
-export function getPortalsOrgURLs(workspaceRootFolders:WorkspaceFolder[] | null, telemetry: ITelemetry ) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let output: any[] = [];
-    try {
-        workspaceRootFolders?.forEach(workspaceRootFolder => {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const manifestFiles  = glob.sync('**/*-manifest.yml', { dot: true, cwd: workspaceRootFolder!.uri });
-            if (manifestFiles.length == 0) {
-                output = [{
-                    orgURL: '',
-                    isManifestExists: false
-                }];
-            }else {
-                manifestFiles?.forEach(manifestFile =>{
-                    output.push({
-                        orgURL: manifestFile.split("-manifest")[0].replace(/.*[portalconfig]\//,''),
-                        isManifestExists: true
-                    });
-                })
-            }
-        });
-    }catch(exception){
-        sendTelemetryEvent(telemetry, { methodName:getPortalsOrgURLs.name,eventName: 'getPortalsOrgURLs', exception: exception as Error });
-    }
-    return output;
-}

src/common/utilities/WorkspaceInfoFinderUtil.ts

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
+
+import {
+    WorkspaceFolder
+} from 'vscode-languageserver/node';
+import { glob } from 'glob';
+import { sendTelemetryEvent } from "../../client/power-pages/telemetry";
+import { ITelemetry } from "../../client/telemetry/ITelemetry";
+
+export function getPortalsOrgURLs(workspaceRootFolders: WorkspaceFolder[] | null, telemetry: ITelemetry) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let output: any[] = [];
+    try {
+        workspaceRootFolders?.forEach(workspaceRootFolder => {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            const manifestFiles = glob.sync('**/*-manifest.yml', { dot: true, cwd: workspaceRootFolder!.uri });
+            if (manifestFiles.length == 0) {
+                output = [{
+                    orgURL: '',
+                    isManifestExists: false
+                }];
+            } else {
+                manifestFiles?.forEach(manifestFile => {
+                    output.push({
+                        orgURL: manifestFile.split("-manifest")[0].replace(/.*[portalconfig]\//, ''),
+                        isManifestExists: true
+                    });
+                })
+            }
+        });
+    } catch (exception) {
+        sendTelemetryEvent(telemetry, { methodName: getPortalsOrgURLs.name, eventName: 'getPortalsOrgURLs', exception: exception as Error });
+    }
+    return output;
+}

src/server/YamlServer.ts

@@ -41,6 +41,7 @@ let hasDiagnosticRelatedInformationCapability = false;
 
 
 connection.onInitialize((params: InitializeParams) => {
+
     const capabilities = params.capabilities;
     workspaceRootFolders = params.workspaceFolders;
     // Does the client support the `workspace/configuration` request?
@@ -93,7 +94,7 @@ connection.onInitialized(() => {
 // The content of a text document has changed. This event is emitted
 // when the text document first opened or when its content has changed.
 documents.onDidChangeContent(change => {
-	editedTextDocument = (change.document);
+    editedTextDocument = (change.document);
 });
 
 
@@ -135,7 +136,7 @@ function getSuggestions(rowIndex: number, pathOfFileBeingEdited: string) {
         }
     }
     // we send telemetry data only in case of success, otherwise the logs will be bloated with unnecessary data
-    if(completionItems.length > 0) {
+    if (completionItems.length > 0) {
         telemetryData.properties.success = 'true';
         telemetryData.measurements.countOfAutoCompleteResults = completionItems.length;
         sendTelemetryEvent(connection, telemetryData);

src/server/lib/PortalManifestReader.ts

@@ -10,7 +10,7 @@ import { URL } from 'url';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as YAML from 'yaml';
-import { getPortalConfigFolderUrl } from '../../common/PortalConfigFinder';
+import { getPortalConfigFolderUrl } from '../../common/utilities/PathFinderUtil';
 
 const manifest = '-manifest';
 
@@ -19,7 +19,7 @@ export interface IManifestElement {
     RecordId: string;
 }
 
-export function getMatchedManifestRecords(workspaceRootFolders : WorkspaceFolder[] | null, keyForCompletion: string, pathOfFileBeingEdited?: string) : IManifestElement[] {
+export function getMatchedManifestRecords(workspaceRootFolders: WorkspaceFolder[] | null, keyForCompletion: string, pathOfFileBeingEdited?: string): IManifestElement[] {
     let matchedManifestRecords: IManifestElement[] = [];
     if (pathOfFileBeingEdited) {
         const portalConfigFolderUrl = getPortalConfigFolderUrl(workspaceRootFolders, pathOfFileBeingEdited) as URL | null; //https://github.com/Microsoft/TypeScript/issues/11498