Merge pull request #441 from glennsarti/gh-440-add-modulepath

(GH-447)(GH-440)(GH-446) Add modulepath setting and deprecate enable-file-cache

Author: James Pogran

CHANGELOG.md

@@ -6,6 +6,10 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 ## Unreleased
 
+- ([GH-446](https://github.com/lingua-pupuli/puppet-vscode/issues/446)) Remove deprecated --enable-file-cache option for Editor Services
+- ([GH-440](https://github.com/lingua-pupuli/puppet-vscode/issues/440)) Add a setting for additional modulepath
+- ([GH-447](https://github.com/lingua-pupuli/puppet-vscode/issues/447)) Update puppet-editor-services to [0.17.0](https://github.com/lingua-pupuli/puppet-editor-services/blob/master/CHANGELOG.md#0170---2018-12-14)
+
 ## [0.14.0] - 2018-12-03
 
 ### Changed

editor-services.json

@@ -1,3 +1,3 @@
 {
-  "release": "0.16.0"
+  "release": "0.17.0"
 }

package.json

@@ -280,6 +280,11 @@
             "verbose"
           ]
         },
+        "puppet.editorService.modulePath": {
+          "type": "string",
+          "default": "",
+          "description": "Additional module paths to use when starting the Editor Services. On Windows this is delimited with a semicolon, and on all other platforms, with a colon. For example C:\\Path1;C:\\Path2"
+        },
         "puppet.editorService.protocol": {
           "type": "string",
           "default": "stdio",

src/configuration.ts

@@ -11,7 +11,6 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
   public host: string;
   public port: number;
   public timeout: number;
-  public enableFileCache: boolean;
   public debugFilePath: string;
   private settings: ISettings;
 
@@ -21,7 +20,6 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
     this.host = this.settings.editorService.tcp.address;
     this.port = this.settings.editorService.tcp.port;
     this.timeout = this.settings.editorService.timeout;
-    this.enableFileCache = (this.settings.editorService.featureflags.indexOf('filecache') !== -1);
     this.debugFilePath = this.settings.editorService.debugFilePath;
 
     this._puppetInstallType = this.settings.installType;
@@ -187,10 +185,6 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
       args.push('--local-workspace=' + vscode.workspace.workspaceFolders[0].uri.fsPath);
     }
 
-    if (this.enableFileCache) {
-      args.push('--enable-file-cache');
-    }
-
     if (this.debugFilePath !== undefined && this.debugFilePath !== '') {
       args.push('--debug=' + this.debugFilePath);
     }

src/helpers/commandHelper.ts

@@ -14,7 +14,7 @@ export class CommandEnvironmentHelper {
   ): Executable {
     let exe: Executable = {
       command: this.buildExecutableCommand(settings, config),
-      args: this.buildLanguageServerArguments(languageServerpath, settings, config),
+      args: this.buildLanguageServerArguments(languageServerpath, settings),
       options: {},
     };
 
@@ -64,7 +64,6 @@ export class CommandEnvironmentHelper {
   private static buildLanguageServerArguments(
     serverPath: string,
     settings: ISettings,
-    config: IConnectionConfiguration,
   ): string[] {
     let args = [serverPath];
 
@@ -90,8 +89,8 @@ export class CommandEnvironmentHelper {
     if (vscode.workspace.workspaceFolders !== undefined) {
       args.push('--local-workspace=' + vscode.workspace.workspaceFolders[0].uri.fsPath);
     }
-    if (config.enableFileCache) {
-      args.push('--enable-file-cache');
+    if (settings.editorService.modulePath !== undefined && settings.editorService.modulePath !== '') {
+      args.push('--puppet-settings=--modulepath,' + settings.editorService.modulePath);
     }
     if (settings.editorService.debugFilePath !== undefined && settings.editorService.debugFilePath !== '') {
       args.push('--debug=' + settings.editorService.debugFilePath);

src/interfaces.ts

@@ -39,7 +39,6 @@ export interface IConnectionConfiguration {
   host: string;
   port: number;
   timeout: number;
-  enableFileCache: boolean;
   debugFilePath: string;
   puppetBaseDir: string;
   puppetDir: string;

src/settings.ts

@@ -17,6 +17,7 @@ export interface IEditorServiceSettings {
   docker?: IEditorServiceDockerSettings;
   enable?: boolean;
   featureflags?: string[];
+  modulePath?: string;
   loglevel?: string;
   protocol?: ProtocolType;
   tcp?: IEditorServiceTCPSettings;
@@ -119,6 +120,7 @@ export function settingsFromWorkspace(): ISettings {
     enable: true,
     featureflags: [],
     loglevel: "normal",
+    modulePath: "",
     protocol: ProtocolType.STDIO,
     timeout: 10,
   };