brighterscript 0.51.4 → 0.52.0

package/CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## [0.52.0](https://github.com/rokucommunity/brighterscript/compare/v0.51.4...v0.52.0) - 2022-06-08
+### Added
+ - LanguageServer: Load projects based on bsconfig.json presence ([#613](https://github.com/rokucommunity/brighterscript/pull/613))
+### Changed
+ - upgrade to [roku-deploy@3.7.1](https://github.com/rokucommunity/roku-deploy/blob/master/CHANGELOG.md#371---2022-06-08)
+
+
+
 ## [0.51.4](https://github.com/rokucommunity/brighterscript/compare/v0.51.3...v0.51.4) - 2022-05-31
 ### Fixed
  - Add allowBrighterScriptInBrightScript to bsconfig.schema.json ([#610](https://github.com/rokucommunity/brighterscript/pull/610))

package/dist/DiagnosticCollection.d.ts

@@ -1,9 +1,9 @@
 import type { BsDiagnostic } from './interfaces';
-import type { Workspace } from './LanguageServer';
+import type { Project } from './LanguageServer';
 export declare class DiagnosticCollection {
     private previousDiagnosticsByFile;
-    getPatch(workspaces: Workspace[]): Promise<Record<string, KeyedDiagnostic[]>>;
-    private getDiagnosticsByFileFromWorkspaces;
+    getPatch(projects: Project[]): Promise<Record<string, KeyedDiagnostic[]>>;
+    private getDiagnosticsByFileFromProjects;
     /**
      * Get a patch for all the files that have been removed since last time
      */

package/dist/DiagnosticCollection.js

@@ -5,20 +5,20 @@ class DiagnosticCollection {
     constructor() {
         this.previousDiagnosticsByFile = {};
     }
-    async getPatch(workspaces) {
-        const diagnosticsByFile = await this.getDiagnosticsByFileFromWorkspaces(workspaces);
+    async getPatch(projects) {
+        const diagnosticsByFile = await this.getDiagnosticsByFileFromProjects(projects);
         const patch = Object.assign(Object.assign(Object.assign({}, this.getRemovedPatch(diagnosticsByFile)), this.getModifiedPatch(diagnosticsByFile)), this.getAddedPatch(diagnosticsByFile));
         //save the new list of diagnostics
         this.previousDiagnosticsByFile = diagnosticsByFile;
         return patch;
     }
-    async getDiagnosticsByFileFromWorkspaces(workspaces) {
+    async getDiagnosticsByFileFromProjects(projects) {
         var _a;
         const result = {};
         //wait for all programs to finish running. This ensures the `Program` exists.
-        await Promise.all(workspaces.map(x => x.firstRunPromise));
-        //get all diagnostics for all workspaces
-        let diagnostics = Array.prototype.concat.apply([], workspaces.map((x) => x.builder.getDiagnostics()));
+        await Promise.all(projects.map(x => x.firstRunPromise));
+        //get all diagnostics for all projects
+        let diagnostics = Array.prototype.concat.apply([], projects.map((x) => x.builder.getDiagnostics()));
         const keys = {};
         //build the full current set of diagnostics by file
         for (let diagnostic of diagnostics) {

package/dist/DiagnosticCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"DiagnosticCollection.js","sourceRoot":"","sources":["../src/DiagnosticCollection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DiagnosticCollection.js","sourceRoot":"","sources":["../src/DiagnosticCollection.ts"],"names":[],"mappings":"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"}

package/dist/LanguageServer.d.ts

@@ -5,18 +5,18 @@ import { ProgramBuilder } from './ProgramBuilder';
 import { Throttler } from './Throttler';
 export declare class LanguageServer {
     private connection;
-    workspaces: Workspace[];
+    projects: Project[];
     /**
      * The number of milliseconds that should be used for language server typing debouncing
      */
     private debounceTimeout;
     /**
-     * These workspaces are created on the fly whenever a file is opened that is not included
-     * in any of the workspace projects.
-     * Basically these are single-file workspaces to at least get parsing for standalone files.
+     * These projects are created on the fly whenever a file is opened that is not included
+     * in any of the workspace-based projects.
+     * Basically these are single-file projects to at least get parsing for standalone files.
      * Also, they should only be created when the file is opened, and destroyed when the file is closed.
      */
-    standaloneFileWorkspaces: Record<string, Workspace>;
+    standaloneFileProjects: Record<string, Project>;
     private hasConfigurationCapability;
     /**
      * Indicates whether the client supports workspace folders
@@ -41,7 +41,27 @@ export declare class LanguageServer {
     onInitialize(params: InitializeParams): {
         capabilities: ServerCapabilities<any>;
     };
-    private initialWorkspacesCreated;
+    private initialProjectsCreated;
+    /**
+     * Ask the client for the list of `files.exclude` patterns. Useful when determining if we should process a file
+     */
+    private getWorkspaceExcludeGlobs;
+    /**
+     * Scan the workspace for all `bsconfig.json` files. If at least one is found, then only folders who have bsconfig.json are returned.
+     * If none are found, then the workspaceFolder itself is treated as a project
+     */
+    private getProjectPaths;
+    /**
+     * Find all folders with bsconfig.json files in them, and treat each as a project.
+     * Treat workspaces that don't have a bsconfig.json as a project.
+     * Handle situations where bsconfig.json files were added or removed (to elevate/lower workspaceFolder projects accordingly)
+     * Leave existing projects alone if they are not affected by these changes
+     */
+    private syncProjects;
+    /**
+     * Get all workspace paths from the client
+     */
+    private getWorkspacePaths;
     /**
      * Called when the client has finished initializing
      * @param params
@@ -54,22 +74,16 @@ export declare class LanguageServer {
     /**
      * Wait for all programs' first run to complete
      */
-    private waitAllProgramFirstRuns;
-    /**
-     * Create project for each new workspace. If the workspace is already known,
-     * it is skipped.
-     * @param workspaceFolders
-     */
-    private createWorkspaces;
+    private waitAllProjectFirstRuns;
     /**
      * Event handler for when the program wants to load file contents.
      * anytime the program wants to load a file, check with our in-memory document cache first
      */
     private documentFileResolver;
     private getConfigFilePath;
-    private createWorkspace;
-    private createStandaloneFileWorkspace;
-    private getWorkspaces;
+    private createProject;
+    private createStandaloneFileProject;
+    private getProjects;
     /**
      * Provide a list of completion items based on the current cursor position
      * @param textDocumentPosition
@@ -82,9 +96,13 @@ export declare class LanguageServer {
     private onCompletionResolve;
     private onCodeAction;
     /**
-     * Reload all specified workspaces, or all workspaces if no workspaces are specified
+     * Remove a project from the language server
+     */
+    private removeProject;
+    /**
+     * Reload each of the specified workspaces
      */
-    private reloadWorkspaces;
+    private reloadProjects;
     private getRootDir;
     /**
      * Sometimes users will alter their bsconfig files array, and will include standalone files.
@@ -93,7 +111,7 @@ export declare class LanguageServer {
      *
      * Sometimes files that used to be included are now excluded, so those open files need to be re-processed as standalone
      */
-    private synchronizeStandaloneWorkspaces;
+    private synchronizeStandaloneProjects;
     private onDidChangeConfiguration;
     /**
      * Called when watched files changed (add/change/delete).
@@ -108,7 +126,7 @@ export declare class LanguageServer {
      * any file changes you receive with no unexpected side-effects
      * @param changes
      */
-    handleFileChanges(workspace: Workspace, changes: {
+    handleFileChanges(project: Project, changes: {
         type: FileChangeType;
         srcPath: string;
     }[]): Promise<void>;
@@ -134,14 +152,21 @@ export declare class LanguageServer {
     private transpileFile;
     dispose(): void;
 }
-export interface Workspace {
+export interface Project {
     firstRunPromise: Promise<any>;
     builder: ProgramBuilder;
+    /**
+     * The path to where the project resides
+     */
+    projectPath: string;
+    /**
+     * The path to the workspace where this project resides. A workspace can have multiple projects (by adding a bsconfig.json to each folder).
+     */
     workspacePath: string;
     isFirstRunComplete: boolean;
     isFirstRunSuccessful: boolean;
     configFilePath?: string;
-    isStandaloneFileWorkspace: boolean;
+    isStandaloneFileProject: boolean;
 }
 export declare enum CustomCommands {
     TranspileFile = "TranspileFile"