Merge pull request #588 from humphd/merge-master-brackets1.9

Fix #569: Merge Bramble with upstream Adobe Brackets (1.9 dev)

Author: humphd

.brackets.json

@@ -2,15 +2,33 @@
     "jslint.options": {
         "vars": true,
         "plusplus": true,
+        "browser": false,
         "devel": true,
         "nomen": true,
+        "indent": 4,
         "maxerr": 50,
-        "es5": true
+        "es5": true,
+        "predef": [
+            "brackets",
+
+            "require",
+            "define",
+            "$",
+
+            "window",
+            "setTimeout",
+            "clearTimeout",
+
+            "ArrayBuffer",
+            "XMLHttpRequest",
+            "Uint32Array",
+            "WebSocket"
+        ]
     },
     "defaultExtension": "js",
     "language": {
         "javascript": {
-            "linting.prefer": ["JSLint", "JSHint"],
+            "linting.prefer": ["ESLint", "JSLint"],
             "linting.usePreferredOnly": true
         }
     },

.eslintrc.json

@@ -0,0 +1,72 @@
+{
+    "rules": {
+        "no-bitwise": 0,
+        "curly": 2,
+        "eqeqeq": 2,
+        "guard-for-in": 0,
+        "wrap-iife": [2, "outside"],
+        "no-use-before-define": 0,
+        "new-cap": [0, {
+            "capIsNewExceptions": [
+                "$.Deferred",
+                "$.Event",
+                "CodeMirror.Pos",
+                "Immutable.Map",
+                "Immutable.List",
+                "JSLINT"
+            ]}],
+        "no-caller": 2,
+        "no-empty": 0,
+        "no-new": 2,
+        "no-invalid-regexp": 2,
+        "no-control-regex": 2,
+        "no-regex-spaces": 2,
+        "no-undef": 2,
+        "strict": 2,
+        "no-unused-vars": [0, {"vars": "all", "args": "none"}],
+        "semi": 2,
+
+        "no-iterator": 2,
+        "no-loop-func": 2,
+        "no-multi-str": 2,
+        "no-fallthrough": 2,
+        "no-proto": 2,
+        "no-script-url": 1,
+        "no-shadow": 0,
+        "no-shadow-restricted-names": 2,
+        "no-new-func": 2,
+        "no-new-wrappers": 2,
+        "no-new-require": 2,
+        "new-parens": 2,
+        "no-new-object": 2,
+        "no-invalid-this": 0,
+        "indent": [0, 4],
+
+        "valid-jsdoc": 0,
+        "valid-typeof": 2,
+
+        "no-trailing-spaces": 0,
+        "eol-last": 0,
+        "max-len": [1, 120]
+    },
+    "globals": {
+        "brackets": false,
+
+        "require": false,
+        "define": false,
+        "$": false,
+
+        "window": false,
+        "console": false,
+        "setTimeout": false,
+        "clearTimeout": false,
+
+        "ArrayBuffer": false,
+        "XMLHttpRequest": false,
+        "Uint32Array": false,
+        "WebSocket": false
+    },
+    "env": {
+        "browser": true
+    }
+}

.gitignore

@@ -9,6 +9,12 @@ Thumbs.db
 
 # ignore node_modules created by seldomly used documentation updating tool
 /src/extensions/extra/MDNDocs/tools/scrape-mdn/node_modules
+# ignore node_modules inside src
+/src/node_modules
+
+# ignore files copied from node_modules to src/thirdparty
+/src/thirdparty/CodeMirror
+/src/thirdparty/less.min.js
 
 # ignore compiled files
 /dist
@@ -23,11 +29,15 @@ Thumbs.db
 
 /src/extensions/disabled
 
+# ignore .disabled file for default extensions
+/src/extensions/default/*/.disabled
+
 #OSX .DS_Store files
 .DS_Store
 
 # unit test working directory
 /test/results
+/test/temp
 
 # Netbeans
 /nbproject

.gitmodules

@@ -1,18 +1,9 @@
-[submodule "src/thirdparty/CodeMirror"]
-	path = src/thirdparty/CodeMirror
-	url = https://github.com/adobe/CodeMirror2.git
 [submodule "src/thirdparty/path-utils"]
 	path = src/thirdparty/path-utils
 	url = https://github.com/jblas/path-utils.git
 [submodule "src/thirdparty/mustache"]
 	path = src/thirdparty/mustache
 	url = https://github.com/janl/mustache.js.git
-[submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/tern"]
-	path = src/extensions/default/JavaScriptCodeHints/thirdparty/tern
-	url = https://github.com/marijnh/tern.git
-[submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/acorn"]
-	path = src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
-	url = https://github.com/marijnh/acorn.git
 [submodule "src/thirdparty/requirejs"]
 	path = src/thirdparty/requirejs
 	url = https://github.com/jrburke/requirejs.git

.jshintrc

@@ -1,7 +1,7 @@
 language: node_js
+sudo: false # use container-based Travis infrastructure
 node_js:
-- '4.3'
-sudo: false
+  - "6"
 before_script:
 - npm install -g grunt-cli
 script: grunt build-browser-compressed

.travis.yml

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [[email protected]](mailto:[email protected]). All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/