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

Cleaned up toggling commented settings #877

Merged
merged 2 commits into from
May 6, 2019
Merged

Cleaned up toggling commented settings #877

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0011a07
Cleaned up toggling commented settings
93Akkord May 4, 2019
c904783
Updated to include fix by @ioprotium
93Akkord May 5, 2019
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
10 changes: 7 additions & 3 deletions src/pragmaUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,14 @@ export default class PragmaUtil {
private static readonly EnvPragmaWhiteSpacesSupportRegExp = /(?:env=(.+)host=)|(?:env=(.+)os=)|env=(.+)\n?/;

private static toggleComments(line: string, shouldComment: boolean) {
if (shouldComment && !line.trim().startsWith("//")) {
return " //" + line; // 2 spaces as formmating
const isCommented = line.trim().startsWith("//");

if (shouldComment) {
// Replace with RegEx to help match indent size
return !isCommented ? line.replace(/^(\s*)/, "$1// ") : line;
} else {
return line.replace("//", "");
// Only remove if line is commented
return isCommented ? line.replace(/\/\/\s*/, "") : line;
}
}

Expand Down