Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary logging about string expansion #3761

Merged
merged 4 commits into from
May 20, 2024
Merged

Remove unnecessary logging about string expansion #3761

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2162fd5
Remove unnecessary logging about string expansion
andreeis May 17, 2024
8a74ed5
Fix typo in var name
andreeis May 17, 2024
ae9d932
Merge branch 'main' into dev/andris/cmake_tools/fixGitHub_3760
snehara99 May 20, 2024
2c2ae97
Merge branch 'main' into dev/andris/cmake_tools/fixGitHub_3760
andreeis May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/expand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,20 @@ export async function expandString<T>(input: string | T, opts: ExpansionOptions)
const varValueRegexp = ".+?";

async function expandStringHelper(input: string, opts: ExpansionOptions) {
log.debug(localize('expand.expandstringhelper', 'expanding {0}', input));
const envPreNormalize = opts.envOverride ? opts.envOverride : process.env;
const env = EnvironmentUtils.create(envPreNormalize);
const replacements = opts.vars;
replacements.sourceDirectory = replacements.sourceDir;
let circularReference: string | undefined;
let expansionOccurred: boolean = false;

// We accumulate a list of substitutions that we need to make, preventing
// recursively expanding or looping forever on bad replacements
const subs = new Map<string, string>();

const varRegex = /\$\{(\w+)\}/g;
for (const mat of matchAll(input, varRegex)) {
expansionOccurred = true;
const full = mat[0];
const key = mat[1];
if (key !== 'dollar') {
Expand All @@ -169,6 +170,7 @@ async function expandStringHelper(input: string, opts: ExpansionOptions) {

const envRegex1 = RegExp(`\\$\\{env:(${varValueRegexp})\\}`, "g");
for (const mat of matchAll(input, envRegex1)) {
expansionOccurred = true;
const full = mat[0];
const varName = mat[1];
const replacement = fixPaths(env[varName]) || '';
Expand All @@ -177,6 +179,7 @@ async function expandStringHelper(input: string, opts: ExpansionOptions) {

const envRegex2 = RegExp(`\\$\\{env\\.(${varValueRegexp})\\}`, "g");
for (const mat of matchAll(input, envRegex2)) {
expansionOccurred = true;
const full = mat[0];
const varName = mat[1];
const replacement = fixPaths(env[varName]) || '';
Expand All @@ -185,6 +188,7 @@ async function expandStringHelper(input: string, opts: ExpansionOptions) {

const envRegex3 = RegExp(`\\$env\\{(${varValueRegexp})\\}`, "g");
for (const mat of matchAll(input, envRegex3)) {
expansionOccurred = true;
const full = mat[0];
const varName = mat[1];
const replacement: string = fixPaths(env[varName]) || '';
Expand All @@ -208,6 +212,7 @@ async function expandStringHelper(input: string, opts: ExpansionOptions) {
const folderName = mat[1];
const f = vscode.workspace.workspaceFolders.find(folder => folder.name.toLocaleLowerCase() === folderName.toLocaleLowerCase());
if (f) {
expansionOccurred = true;
subs.set(full, f.uri.fsPath);
}
}
Expand All @@ -217,6 +222,7 @@ async function expandStringHelper(input: string, opts: ExpansionOptions) {
const variants = opts.variantVars;
const variantRegex = RegExp(`\\$\\{variant:(${varValueRegexp})\\}`, "g");
for (const mat of matchAll(input, variantRegex)) {
expansionOccurred = true;
const full = mat[0];
const varName = mat[1];
const replacement = variants[varName] || '';
Expand All @@ -236,13 +242,18 @@ async function expandStringHelper(input: string, opts: ExpansionOptions) {
continue; // Don't execute commands more than once per string
}
try {
expansionOccurred = true;
const result = await vscode.commands.executeCommand(command, opts.vars.workspaceFolder);
subs.set(full, `${result}`);
} catch (e) {
log.warning(localize('exception.executing.command', 'Exception while executing command {0} for string: {1} {2}', command, input, errorToString(e)));
}
}

if (expansionOccurred) {
log.debug(localize('expand.expandstringhelper', 'expanded {0}', input));
}

return { ...substituteAll(input, subs), circularReference };
}

Expand Down
Loading