jenkins-bot has submitted this change and it was merged.

Change subject: Use wikimedia preset in .jscsrc
......................................................................


Use wikimedia preset in .jscsrc

As suggested by Krinkle in I239a8e9.

Change-Id: Icd4bf87912d708a88480b343a8234b473cacdec0
---
M .jscsrc
1 file changed, 10 insertions(+), 71 deletions(-)

Approvals:
  JanZerebecki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.jscsrc b/.jscsrc
index 06dac8b..91faec8 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,83 +1,22 @@
 {
-       // ----
-       // This is a copy of the wikimedia preset so we can disable some of the 
rules
-
-       "requireCurlyBraces": [
-               "if",
-               "else",
-               "for",
-               "while",
-               "do",
-               "try",
-               "catch"
-       ],
-       "requireSpaceBeforeKeywords": true,
-       "requireSpaceBeforeBlockStatements": true,
-       "requireParenthesesAroundIIFE": true,
-       "requireSpacesInConditionalExpression": true,
-       "disallowSpacesInNamedFunctionExpression": {
-               "beforeOpeningRoundBrace": true
-       },
-       "disallowSpacesInFunctionDeclaration": {
-               "beforeOpeningRoundBrace": true
-       },
-       "disallowSpacesInCallExpression": true,
-       "requireBlocksOnNewline": 1,
-       "disallowEmptyBlocks": true,
-       "requireSpacesInsideObjectBrackets": "all",
-       "requireSpacesInsideParentheses": "all",
-       "disallowSpaceAfterObjectKeys": true,
-       "requireSpaceBeforeObjectValues": true,
-       "requireCommaBeforeLineBreak": true,
-       "disallowSpaceAfterPrefixUnaryOperators": true,
-       "disallowSpaceBeforePostfixUnaryOperators": true,
-       "disallowSpaceBeforeBinaryOperators": [
-               ","
-       ],
-       "requireSpaceBeforeBinaryOperators": true,
-       "requireSpaceAfterBinaryOperators": true,
-       "disallowImplicitTypeConversion": [
-               "binary",
-               "string"
-       ],
-       "requireCamelCaseOrUpperCaseIdentifiers": true,
-       "disallowKeywords": [
-               "with"
-       ],
-       "disallowMixedSpacesAndTabs": true,
-       "disallowMultipleLineBreaks": true,
-       "disallowOperatorBeforeLineBreak": [
-               "."
-       ],
-       "disallowTrailingWhitespace": true,
-       "disallowTrailingComma": true,
-       "disallowKeywordsOnNewLine": [
-               "else",
-               "catch"
-       ],
-       "requireLineBreakAfterVariableAssignment": true,
-       "requireLineFeedAtFileEnd": true,
-       "requireCapitalizedConstructors": true,
-       "requireDotNotation": true,
-       "disallowYodaConditions": true,
-       "requireSpaceAfterLineComment": true,
-       "disallowNewlineBeforeBlockStatements": true,
-       "validateQuoteMarks": "'",
+       // 
https://github.com/jscs-dev/node-jscs/blob/master/presets/wikimedia.json
+       "preset": "wikimedia",
 
        // ----
        // Rules from wikimedia preset we don't follow
 
-       // "validateIndentation": "\t",
-       // "requireSpaceAfterKeywords": true,
-       // "requireMultipleVarDecl": "onevar",
-       // "disallowDanglingUnderscores": true,
-       // "requireSpacesInsideArrayBrackets": "all",
+       "validateIndentation": null,
+       "requireMultipleVarDecl": null,
+       "disallowDanglingUnderscores": null,
+       "requireSpacesInsideArrayBrackets": null,
 
        // ----
        // Rules from wikimedia preset that should be enabled after fixing 
their violation
 
-       // "disallowQuotedKeysInObjects": "allButReserved",
-       // "validateLineBreaks": "LF",
+       "disallowQuotedKeysInObjects": null,
+       "requireSpacesInForStatement": null,
+       "requireSpaceBetweenArguments": null,
+       "validateLineBreaks": null,
 
        // ----
        // Own rules

-- 
To view, visit https://gerrit.wikimedia.org/r/196553
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd4bf87912d708a88480b343a8234b473cacdec0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Adrian Lang <adrian.he...@wikimedia.de>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to