Skip to content
This repository has been archived by the owner on Aug 31, 2021. It is now read-only.

Commit

Permalink
minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mkloubert committed Jan 1, 2018
1 parent e8cdaea commit 06fa073
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Share via Facebook](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Facebook.png)](https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&quote=vscode-deploy-reloaded) [![Share via Twitter](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Twitter.png)](https://twitter.com/intent/tweet?source=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&text=vscode-deploy-reloaded:%20https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&via=mjkloubert) [![Share via Google+](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Google+.png)](https://plus.google.com/share?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) [![Share via Pinterest](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Pinterest.png)](https://pinterest.com/pin/create/button/?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&media=https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo1.gif&description=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.) [![Share via Reddit](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Reddit.png)](https://www.reddit.com/submit?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&title=vscode-deploy-reloaded) [![Share via LinkedIn](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/LinkedIn.png)](https://www.linkedin.com/shareArticle?mini=true&url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&title=vscode-deploy-reloaded&summary=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.&source=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) [![Share via Wordpress](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Wordpress.png)](https://wordpress.com/press-this.php?u=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&quote=vscode-deploy-reloaded&s=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.&i=https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo1.gif) [![Share via Email](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Email.png)](mailto:?subject=vscode-deploy-reloaded&body=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20'vs-deploy'%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.:%20https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded)


## 0.11.0 (January 1st, 2018; SFTP and values)
## 0.11.1 (January 1st, 2018; SFTP and values)

* can get [placeholders](https://github.com/mkloubert/vscode-deploy-reloaded/wiki/values) from files and environment variables now
* fixed `tryKeyboard` support in [SFTP targets](https://github.com/mkloubert/vscode-deploy-reloaded/wiki/target_sftp)
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "vscode-deploy-reloaded",
"displayName": "Deploy (Reloaded)",
"description": "Deploys files of a workspace to a destination.",
"version": "0.11.0",
"version": "0.11.1",
"publisher": "mkloubert",
"engines": {
"vscode": "^1.19.0"
Expand Down
14 changes: 13 additions & 1 deletion src/values.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ export interface LoadFromItemsOptions {
* The optional scope directory provider.
*/
readonly directoryScopeProvider?: DirectoryScopeProvider;
/**
* An optional function with provides "more" values
* which are added at the beginning.
*/
readonly prefixValuesProvider?: ValuesProvider;
}

/**
Expand Down Expand Up @@ -667,11 +672,18 @@ export function loadFromItems(items: WithValueItems, opts?: LoadFromItemsOptions

let conditialFilter = opts.conditialFilter;
let directoryScopeProvider = opts.directoryScopeProvider;

let prefixValuesProvider = opts.prefixValuesProvider;
if (!prefixValuesProvider) {
prefixValuesProvider = () => [];
}

const VALUES: Value[] = [];

const CREATE_OTHERS_PROVIDER = (thisValue: Value): ValuesProvider => {
return () => VALUES.filter(v => v !== thisValue);
return () => deploy_helpers.asArray( prefixValuesProvider() ).concat(
VALUES
).filter(v => v !== thisValue);
};

const APPEND_VALUE = (newValue: ValueBase) => {
Expand Down
8 changes: 7 additions & 1 deletion src/workspaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1417,6 +1417,8 @@ export class Workspace extends deploy_objects.DisposableBase implements deploy_c
.trace(e, 'workspaces.Workspace.getValues(1)');
}

const WORKSPACE_VALUES = values.map(v => v);

values = values.concat(
deploy_values.loadFromItems(CFG, {
conditialFilter: (i, o) => {
Expand All @@ -1434,7 +1436,7 @@ export class Workspace extends deploy_objects.DisposableBase implements deploy_c
i: i,
ws: ME,
},
values: values.concat(o),
values: WORKSPACE_VALUES.concat(o),
});
}

Expand All @@ -1454,6 +1456,10 @@ export class Workspace extends deploy_objects.DisposableBase implements deploy_c
directoryScopeProvider: () => {
return ME.getSettingScopes();
},

prefixValuesProvider: () => {
return WORKSPACE_VALUES;
},
})
);

Expand Down

0 comments on commit 06fa073

Please sign in to comment.