Skip to content

Commit 3e24d22

Browse files
committed
(GH-446) Deprecate enable-file-cache
As of v0.17.0 of the editor services, the --enable-file-cache option is deprecated. This commit removes this setting actually doing anything and marks the setting as deprecated in the package.json.
1 parent 4f29a9f commit 3e24d22

File tree

4 files changed

+2
-12
lines changed

4 files changed

+2
-12
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
66

77
## Unreleased
88

9+
- ([GH-446](https://github.com/lingua-pupuli/puppet-vscode/issues/446)) Remove deprecated --enable-file-cache option for Editor Services
910
- ([GH-440](https://github.com/lingua-pupuli/puppet-vscode/issues/440)) Add a setting for additional modulepath
1011
- ([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)
1112

src/configuration.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
1111
public host: string;
1212
public port: number;
1313
public timeout: number;
14-
public enableFileCache: boolean;
1514
public debugFilePath: string;
1615
private settings: ISettings;
1716

@@ -21,7 +20,6 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
2120
this.host = this.settings.editorService.tcp.address;
2221
this.port = this.settings.editorService.tcp.port;
2322
this.timeout = this.settings.editorService.timeout;
24-
this.enableFileCache = (this.settings.editorService.featureflags.indexOf('filecache') !== -1);
2523
this.debugFilePath = this.settings.editorService.debugFilePath;
2624

2725
this._puppetInstallType = this.settings.installType;
@@ -187,10 +185,6 @@ export class ConnectionConfiguration implements IConnectionConfiguration {
187185
args.push('--local-workspace=' + vscode.workspace.workspaceFolders[0].uri.fsPath);
188186
}
189187

190-
if (this.enableFileCache) {
191-
args.push('--enable-file-cache');
192-
}
193-
194188
if (this.debugFilePath !== undefined && this.debugFilePath !== '') {
195189
args.push('--debug=' + this.debugFilePath);
196190
}

src/helpers/commandHelper.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class CommandEnvironmentHelper {
1414
): Executable {
1515
let exe: Executable = {
1616
command: this.buildExecutableCommand(settings, config),
17-
args: this.buildLanguageServerArguments(languageServerpath, settings, config),
17+
args: this.buildLanguageServerArguments(languageServerpath, settings),
1818
options: {},
1919
};
2020

@@ -64,7 +64,6 @@ export class CommandEnvironmentHelper {
6464
private static buildLanguageServerArguments(
6565
serverPath: string,
6666
settings: ISettings,
67-
config: IConnectionConfiguration,
6867
): string[] {
6968
let args = [serverPath];
7069

@@ -93,9 +92,6 @@ export class CommandEnvironmentHelper {
9392
if (settings.editorService.modulePath !== undefined && settings.editorService.modulePath !== '') {
9493
args.push('--puppet-settings=--modulepath,' + settings.editorService.modulePath);
9594
}
96-
if (config.enableFileCache) {
97-
args.push('--enable-file-cache');
98-
}
9995
if (settings.editorService.debugFilePath !== undefined && settings.editorService.debugFilePath !== '') {
10096
args.push('--debug=' + settings.editorService.debugFilePath);
10197
}

src/interfaces.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export interface IConnectionConfiguration {
3939
host: string;
4040
port: number;
4141
timeout: number;
42-
enableFileCache: boolean;
4342
debugFilePath: string;
4443
puppetBaseDir: string;
4544
puppetDir: string;

0 commit comments

Comments
 (0)