merging test

.clang-format

@@ -1,3 +1,3 @@
-Language:        JavaScript
-BasedOnStyle:    Google
-ColumnLimit:     80
+Language:        JavaScript
+BasedOnStyle:    Google
+ColumnLimit:     80

.eslintignore

@@ -1,19 +1,19 @@
-*_compressed*.js
-/msg/*
-/build/*
-/dist/*
-/tests/blocks/*
-/tests/themes/*
-/tests/compile/*
-/tests/jsunit/*
-/tests/generators/*
-/tests/mocha/run_mocha_tests_in_browser.js
-/tests/screenshot/*
-/tests/test_runner.js
-/tests/workspace_svg/*
-/generators/*
-/demos/*
-/appengine/*
-/externs/*
-/closure/*
-/scripts/gulpfiles/*
+*_compressed*.js
+/msg/*
+/build/*
+/dist/*
+/tests/blocks/*
+/tests/themes/*
+/tests/compile/*
+/tests/jsunit/*
+/tests/generators/*
+/tests/mocha/run_mocha_tests_in_browser.js
+/tests/screenshot/*
+/tests/test_runner.js
+/tests/workspace_svg/*
+/generators/*
+/demos/*
+/appengine/*
+/externs/*
+/closure/*
+/scripts/gulpfiles/*

.eslintrc.json

@@ -1,88 +1,88 @@
-{
-    "rules": {
-        "curly": ["error"],
-        "eol-last": ["error"],
-        "keyword-spacing": ["error"],
-        "linebreak-style": ["error", "unix"],
-        "max-len": [
-            "error",
-            {
-                "code": 100,
-                "tabWidth": 4,
-                "ignoreStrings": true,
-                "ignoreRegExpLiterals": true,
-                "ignoreUrls": true
-            }
-        ],
-        "no-trailing-spaces": ["error", { "skipBlankLines": true }],
-        "no-unused-vars": [
-            "warn",
-            {
-                "args": "after-used",
-                // Ignore vars starting with an underscore.
-                "varsIgnorePattern": "^_",
-                // Ignore arguments starting with an underscore.
-                "argsIgnorePattern": "^_"
-            }
-        ],
-        // Blockly uses for exporting symbols. no-self-assign added in eslint 5.
-        "no-self-assign": ["off"],
-        // Blockly uses single quotes except for JSON blobs, which must use double quotes.
-        "quotes": ["off"],
-        "semi": ["error", "always"],
-        // Blockly doesn't have space before function paren when defining functions.
-        "space-before-function-paren": ["error", "never"],
-        // Blockly doesn't have space before function paren when calling functions.
-        "func-call-spacing": ["error", "never"],
-        "space-infix-ops": ["error"],
-        // Blockly uses 'use strict' in files.
-        "strict": ["off"],
-        // Closure style allows redeclarations.
-        "no-redeclare": ["off"],
-        "valid-jsdoc": ["error", {"requireReturn": false}],
-        "no-console": ["off"],
-        "no-multi-spaces": ["error", { "ignoreEOLComments": true }],
-        "operator-linebreak": ["error", "after"],
-        "spaced-comment": ["error", "always", {
-            "block": {
-                "balanced": true
-            },
-            "exceptions": ["*"]
-        }],
-        // Blockly uses prefixes for optional arguments and test-only functions.
-        "camelcase": ["error", {
-            "properties": "never",
-            "allow": ["^opt_", "^_opt_", "^testOnly_"]
-        }],
-        // Use clang-format for indentation by running `npm run format`.
-        "indent": ["off"],
-        // Blockly uses capital letters for some non-constructor namespaces.
-        // Keep them for legacy reasons.
-        "new-cap": ["off"],
-        // Mostly use default rules for brace style, but allow single-line blocks.
-        "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
-        // Blockly uses objects as maps, but uses Object.create(null) to
-        // instantiate them.
-        "guard-for-in": ["off"],
-        "prefer-spread": ["off"],
-        "comma-dangle": ["error", {
-            "arrays": "always-multiline",
-            "objects": "always-multiline",
-            "imports": "always-multiline",
-            "exports": "always-multiline",
-            "functions": "ignore"
-        }]
-    },
-    "env": {
-        "es2020": true,
-        "browser": true
-    },
-    "globals": {
-        "Blockly": true,
-        "goog": true,
-        "exports": true
-    },
-    "extends": [
-        "eslint:recommended", "google"
-    ]
-}
+{
+    "rules": {
+        "curly": ["error"],
+        "eol-last": ["error"],
+        "keyword-spacing": ["error"],
+        "linebreak-style": ["error", "unix"],
+        "max-len": [
+            "error",
+            {
+                "code": 100,
+                "tabWidth": 4,
+                "ignoreStrings": true,
+                "ignoreRegExpLiterals": true,
+                "ignoreUrls": true
+            }
+        ],
+        "no-trailing-spaces": ["error", { "skipBlankLines": true }],
+        "no-unused-vars": [
+            "warn",
+            {
+                "args": "after-used",
+                // Ignore vars starting with an underscore.
+                "varsIgnorePattern": "^_",
+                // Ignore arguments starting with an underscore.
+                "argsIgnorePattern": "^_"
+            }
+        ],
+        // Blockly uses for exporting symbols. no-self-assign added in eslint 5.
+        "no-self-assign": ["off"],
+        // Blockly uses single quotes except for JSON blobs, which must use double quotes.
+        "quotes": ["off"],
+        "semi": ["error", "always"],
+        // Blockly doesn't have space before function paren when defining functions.
+        "space-before-function-paren": ["error", "never"],
+        // Blockly doesn't have space before function paren when calling functions.
+        "func-call-spacing": ["error", "never"],
+        "space-infix-ops": ["error"],
+        // Blockly uses 'use strict' in files.
+        "strict": ["off"],
+        // Closure style allows redeclarations.
+        "no-redeclare": ["off"],
+        "valid-jsdoc": ["error", {"requireReturn": false}],
+        "no-console": ["off"],
+        "no-multi-spaces": ["error", { "ignoreEOLComments": true }],
+        "operator-linebreak": ["error", "after"],
+        "spaced-comment": ["error", "always", {
+            "block": {
+                "balanced": true
+            },
+            "exceptions": ["*"]
+        }],
+        // Blockly uses prefixes for optional arguments and test-only functions.
+        "camelcase": ["error", {
+            "properties": "never",
+            "allow": ["^opt_", "^_opt_", "^testOnly_"]
+        }],
+        // Use clang-format for indentation by running `npm run format`.
+        "indent": ["off"],
+        // Blockly uses capital letters for some non-constructor namespaces.
+        // Keep them for legacy reasons.
+        "new-cap": ["off"],
+        // Mostly use default rules for brace style, but allow single-line blocks.
+        "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
+        // Blockly uses objects as maps, but uses Object.create(null) to
+        // instantiate them.
+        "guard-for-in": ["off"],
+        "prefer-spread": ["off"],
+        "comma-dangle": ["error", {
+            "arrays": "always-multiline",
+            "objects": "always-multiline",
+            "imports": "always-multiline",
+            "exports": "always-multiline",
+            "functions": "ignore"
+        }]
+    },
+    "env": {
+        "es2020": true,
+        "browser": true
+    },
+    "globals": {
+        "Blockly": true,
+        "goog": true,
+        "exports": true
+    },
+    "extends": [
+        "eslint:recommended", "google"
+    ]
+}

.github/CONTRIBUTING.md

@@ -1,40 +1,40 @@
-# Contributing to Blockly
-
-Want to contribute? Great!
-- First, read this page (including the small print at the end).
-- Second, please make pull requests against develop, not master. If your patch
-  needs to go into master immediately, include a note in your PR.
-
-For more information on style guide and other details, head over to the [Blockly Developers site](https://developers.google.com/blockly/guides/modify/contributing).
-
-### Before you contribute
-Before we can use your code, you must sign the
-[Google Individual Contributor License Agreement](https://cla.developers.google.com/about/google-individual)
-(CLA), which you can do online. The CLA is necessary mainly because you own the
-copyright to your changes, even after your contribution becomes part of our
-codebase, so we need your permission to use and distribute your code. We also
-need to be sure of various other things—for instance that you'll tell us if you
-know that your code infringes on other people's patents. You don't have to sign
-the CLA until after you've submitted your code for review and a member has
-approved it, but you must do it before we can put your code into our codebase.
-
-### Larger changes
-Before you start working on a larger contribution, you should get in touch with
-us first through the issue tracker with your idea so that we can help out and
-possibly guide you. Coordinating up front makes it much easier to avoid
-frustration later on.
-
-### Code reviews
-All submissions, including submissions by project members, require review. We
-use Github pull requests for this purpose.
-
-### Browser compatibility
-We care strongly about making Blockly work on all browsers.  As of 2017 we 
-support IE 10 and 11, Edge, Chrome, Safari, and Firefox.  We will not accept
-changes that only work on a subset of those browsers.  You can check [caniuse.com](https://caniuse.com/) 
-for compatibility information.
-
-### The small print
-Contributions made by corporations are covered by a different agreement than
-the one above, the
-[Software Grant and Corporate Contributor License Agreement](https://cla.developers.google.com/about/google-corporate).
+# Contributing to Blockly
+
+Want to contribute? Great!
+- First, read this page (including the small print at the end).
+- Second, please make pull requests against develop, not master. If your patch
+  needs to go into master immediately, include a note in your PR.
+
+For more information on style guide and other details, head over to the [Blockly Developers site](https://developers.google.com/blockly/guides/modify/contributing).
+
+### Before you contribute
+Before we can use your code, you must sign the
+[Google Individual Contributor License Agreement](https://cla.developers.google.com/about/google-individual)
+(CLA), which you can do online. The CLA is necessary mainly because you own the
+copyright to your changes, even after your contribution becomes part of our
+codebase, so we need your permission to use and distribute your code. We also
+need to be sure of various other things—for instance that you'll tell us if you
+know that your code infringes on other people's patents. You don't have to sign
+the CLA until after you've submitted your code for review and a member has
+approved it, but you must do it before we can put your code into our codebase.
+
+### Larger changes
+Before you start working on a larger contribution, you should get in touch with
+us first through the issue tracker with your idea so that we can help out and
+possibly guide you. Coordinating up front makes it much easier to avoid
+frustration later on.
+
+### Code reviews
+All submissions, including submissions by project members, require review. We
+use Github pull requests for this purpose.
+
+### Browser compatibility
+We care strongly about making Blockly work on all browsers.  As of 2017 we 
+support IE 10 and 11, Edge, Chrome, Safari, and Firefox.  We will not accept
+changes that only work on a subset of those browsers.  You can check [caniuse.com](https://caniuse.com/) 
+for compatibility information.
+
+### The small print
+Contributions made by corporations are covered by a different agreement than
+the one above, the
+[Software Grant and Corporate Contributor License Agreement](https://cla.developers.google.com/about/google-corporate).