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

add common clang-format rules #459

Merged
merged 3 commits into from Dec 7, 2016
Merged

add common clang-format rules #459

merged 3 commits into from Dec 7, 2016

Conversation

FredKSchott
Copy link
Contributor

  • CHANGELOG.md has been updated

Only merge when there are no outstanding PRs, and remember to run npm run format after merging!

/cc @rictic @justinfagnani

@@ -74,6 +75,7 @@
"devDependencies": {
"bower": "^1.7.9",
"chai": "^3.5.0",
"clang-format": "^1.0.45",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pin to a specific version please

@FredKSchott
Copy link
Contributor Author

I will rebase this off of master once the current batch of PRs are merged, and then commit the reformatting for a final look before merging.

@rictic
Copy link
Contributor

rictic commented Dec 7, 2016

Will there ever be a time when there's not a batch of open PRs?

@FredKSchott
Copy link
Contributor Author

FredKSchott commented Dec 7, 2016

If we can get #490 in we should be good. Trying to avoid unnecessary work for @justinfagnani if we can.

No harm in seeing it here though, and then rebasing later. Pushing formatted code up to this branch...

@@ -21,6 +25,8 @@ const m = chalk.magenta;
const CLI_TITLE = chalk.bold.underline('Polymer-CLI');
const CLI_DESCRIPTION = 'The multi-tool for Polymer projects';
const CLI_USAGE = 'Usage: \`polymer <command> [options ...]\`';

// clang-format off - keep the custom white space here to help readibility
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like this is working now! Woo!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!


let buildStream = mergeStream(sourcesStream, depsStream)
.once('data', () => { logger.debug('Analyzing build dependencies...'); })
.pipe(polymerProject.analyzer);
.once(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ugh, it's such a shame that these get so indented. No option to fix it as far as I could tell

@FredKSchott
Copy link
Contributor Author

@rictic PTAL

@@ -1,8 +1,9 @@
import {minify as uglify, MinifyOptions as UglifyOptions} from 'uglify-js';
import {css as cssSlam} from 'css-slam';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to add the license header

@@ -21,6 +25,8 @@ const m = chalk.magenta;
const CLI_TITLE = chalk.bold.underline('Polymer-CLI');
const CLI_DESCRIPTION = 'The multi-tool for Polymer projects';
const CLI_USAGE = 'Usage: \`polymer <command> [options ...]\`';

// clang-format off - keep the custom white space here to help readibility
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

@FredKSchott FredKSchott merged commit 382ec4c into master Dec 7, 2016
@FredKSchott FredKSchott deleted the clang-format branch December 7, 2016 19:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants