Merge remote-tracking branch 'origin/master' into pflynn/in-browser-f…

…ile-system

* origin/master: (1140 commits)
  Typo fix
  Set sprint 37
  Add session scope
  Fix signature of `setValueAndSave`
  Unit test for bug #6609 (Fast file replacement operations can be missed)
  Dispatch a FileSystem "change" event even when a dir change yields empty added/removed lists - because there's a delay between the change occurring and the time we re-read the dir contents in response, we might see back-to-back changes (e.g. a delete-recreate pair) as a no-op even though something definitely changed. See #6609 for an example bug.
  Update NOTICE
  Define self to prevent exception, for #6607
  Better doc comment for `Scope.set`
  Changes based on review comments
  Maintain the original line endings in preferences files
  Properly reconfigure the user prefs in test windows.
  Set preferences are, by default, set in the context in which they are defined.
  Nits fixed
  revert submodule add
  add required success/error callbacks for jstree load_node
  Nit fixes after PR #6123
  Updated by ALF automation.
  Setting the side toolabr to the top
  remove unwatchPathsWithPrefix and consilidate with unwatchPath
  ...

Conflicts:
	package.json
	src/config.json
	src/document/DocumentCommandHandlers.js
	src/extensibility/ExtensionManager.js
	src/filesystem/FileSystem.js
	src/filesystem/FileSystemManager.js
	src/nls/root/strings.js
	src/project/ProjectManager.js
	src/styles/brackets_patterns_override.less
	src/utils/ExtensionLoader.js

.brackets.json

@@ -0,0 +1,19 @@
+{
+    "jslint.options": {
+        "vars": true,
+        "plusplus": true,
+        "devel": true,
+        "nomen": true,
+        "indent": 4,
+        "maxerr": 50
+    },
+    "defaultExtension": "js",
+    "path": {
+        "src/thirdparty/CodeMirror2/**/*.js": {
+            "spaceUnits": 2,
+            "linting.enabled": false
+        }
+    },
+    "spaceUnits": 4,
+    "useTabChar": false
+}

.gitignore

@@ -1,6 +1,4 @@
 Thumbs.db
-src/brackets.css
-src/brackets.min.css
 
 # ignore jenkins build info
 /build.prop
@@ -9,22 +7,30 @@ src/brackets.min.css
 /node_modules
 /npm-debug.log
 
+# ignore compiled files
+/dist
+/src/.index.html
+/src/styles/brackets.min.css
+/src/styles/brackets.min.css.map
 
 # ignore everything in the dev extension directory EXCEPT the README
 # (so that the directory is non-empty and can be in git)
-src/extensions/dev/*
-!src/extensions/dev/README
+/src/extensions/dev/*
+!/src/extensions/dev/README
 
-src/extensions/disabled
+/src/extensions/disabled
 
 #OSX .DS_Store files
 .DS_Store
 
 # unit test working directory
-test/results
+/test/results
 
 # Netbeans
 /nbproject
 
 # PhpStorm
 .idea
+
+# Files that can be automatically downloaded that we don't want to ship with our builds
+/src/extensibility/node/node_modules/request/tests/

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "src/thirdparty/path-utils"]
 	path = src/thirdparty/path-utils
 	url = https://github.com/jblas/path-utils.git
-[submodule "src/thirdparty/smart-auto-complete"]
-	path = src/thirdparty/smart-auto-complete
-	url = https://github.com/laktek/jQuery-Smart-Auto-Complete.git
 [submodule "src/thirdparty/mustache"]
 	path = src/thirdparty/mustache
 	url = https://github.com/janl/mustache.js.git

.jshintrc

@@ -9,7 +9,7 @@
     "noarg"         : true,
     "noempty"       : true,
     "nonew"         : true,
-    "plusplus"      : true,
+    "plusplus"      : false,
     "regexp"        : true,
     "undef"         : true,
     "strict"        : true,

Gruntfile.js

@@ -24,11 +24,165 @@
 module.exports = function (grunt) {
     'use strict';
 
+    // load dependencies
+    require('load-grunt-tasks')(grunt, {pattern: ['grunt-contrib-*', 'grunt-targethtml', 'grunt-usemin']});
+    grunt.loadTasks('tasks');
+
     var common = require("./tasks/lib/common")(grunt);
 
     // Project configuration.
     grunt.initConfig({
         pkg  : grunt.file.readJSON("package.json"),
+        clean: {
+            dist: {
+                files: [{
+                    dot: true,
+                    src: [
+                        'dist',
+                        'src/.index.html',
+                        'src/styles/brackets.css'
+                    ]
+                }]
+            }
+        },
+        copy: {
+            dist: {
+                files: [
+                    {
+                        'dist/index.html': 'src/.index.html'
+                    },
+                    /* static files */
+                    {
+                        expand: true,
+                        dest: 'dist/',
+                        cwd: 'src/',
+                        src: [
+                            'nls/{,*/}*.js',
+                            'xorigin.js',
+                            'dependencies.js',
+                            'thirdparty/requirejs/require.js',
+                            'LiveDevelopment/launch.html'
+                        ]
+                    },
+                    /* node domains are not minified and must be copied to dist */
+                    {
+                        expand: true,
+                        dest: 'dist/',
+                        cwd: 'src/',
+                        src: [
+                            'extensibility/node/**',
+                            '!extensibility/node/spec/**',
+                            'filesystem/impls/appshell/node/**',
+                            '!filesystem/impls/appshell/node/spec/**'
+                        ]
+                    },
+                    /* extensions and CodeMirror modes */
+                    {
+                        expand: true,
+                        dest: 'dist/',
+                        cwd: 'src/',
+                        src: [
+                            '!extensions/default/*/unittest-files/**/*',
+                            '!extensions/default/*/unittests.js',
+                            'extensions/default/*/**/*',
+                            'extensions/dev/*',
+                            'extensions/samples/**/*',
+                            'thirdparty/CodeMirror2/addon/{,*/}*',
+                            'thirdparty/CodeMirror2/keymap/{,*/}*',
+                            'thirdparty/CodeMirror2/lib/{,*/}*',
+                            'thirdparty/CodeMirror2/mode/{,*/}*',
+                            'thirdparty/CodeMirror2/theme/{,*/}*',
+                            'thirdparty/i18n/*.js',
+                            'thirdparty/text/*.js'
+                        ]
+                    },
+                    /* styles, fonts and images */
+                    {
+                        expand: true,
+                        dest: 'dist/styles',
+                        cwd: 'src/styles',
+                        src: ['jsTreeTheme.css', 'fonts/{,*/}*.*', 'images/*', 'brackets.min.css*']
+                    }
+                ]
+            }
+        },
+        less: {
+            dist: {
+                files: {
+                    "src/styles/brackets.min.css": "src/styles/brackets.less"
+                },
+                options: {
+                    compress: true,
+                    sourceMap: true,
+                    sourceMapFilename: 'src/styles/brackets.min.css.map',
+                    outputSourceFiles: true,
+                    sourceMapRootpath: '',
+                    sourceMapBasepath: 'src/styles'
+                }
+            }
+        },
+        requirejs: {
+            dist: {
+                // Options: https://github.com/jrburke/r.js/blob/master/build/example.build.js
+                options: {
+                    // `name` and `out` is set by grunt-usemin
+                    baseUrl: 'src',
+                    optimize: 'uglify2',
+                    // TODO: Figure out how to make sourcemaps work with grunt-usemin
+                    // https://github.com/yeoman/grunt-usemin/issues/30
+                    generateSourceMaps: true,
+                    useSourceUrl: true,
+                    // required to support SourceMaps
+                    // http://requirejs.org/docs/errors.html#sourcemapcomments
+                    preserveLicenseComments: false,
+                    useStrict: true,
+                    // Disable closure, we want define/require to be globals
+                    wrap: false,
+                    exclude: ["text!config.json"],
+                    uglify2: {} // https://github.com/mishoo/UglifyJS2
+                }
+            }
+        },
+        targethtml: {
+            dist: {
+                files: {
+                    'src/.index.html': 'src/index.html'
+                }
+            }
+        },
+        useminPrepare: {
+            options: {
+                dest: 'dist'
+            },
+            html: 'src/.index.html'
+        },
+        usemin: {
+            options: {
+                dirs: ['dist']
+            },
+            html: ['dist/{,*/}*.html']
+        },
+        htmlmin: {
+            dist: {
+                options: {
+                    /*removeCommentsFromCDATA: true,
+                    // https://github.com/yeoman/grunt-usemin/issues/44
+                    //collapseWhitespace: true,
+                    collapseBooleanAttributes: true,
+                    removeAttributeQuotes: true,
+                    removeRedundantAttributes: true,
+                    useShortDoctype: true,
+                    removeEmptyAttributes: true,
+                    removeOptionalTags: true*/
+                },
+                files: [{
+                    expand: true,
+                    cwd: 'src',
+                    src: '*.html',
+                    dest: 'dist'
+                }]
+            }
+        },
         meta : {
             src   : [
                 'src/**/*.js',
@@ -120,10 +274,8 @@ module.exports = function (grunt) {
                 }
             }
         },
-        'jasmine-node': {
-            run: {
-                spec: 'src/extensibility/node/spec/'
-            }
+        'jasmine_node': {
+            projectRoot: 'src/extensibility/node/spec/'
         },
         jshint: {
             all: [
@@ -146,25 +298,36 @@ module.exports = function (grunt) {
             linux: "<%= shell.repo %>/installer/linux/debian/package-root/opt/brackets/brackets"
         }
     });
-
-    // load dependencies
-    grunt.loadTasks('tasks');
-    grunt.loadNpmTasks('grunt-contrib-jasmine');
-    grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-contrib-jasmine-node');
 
     // task: install
-    grunt.registerTask('install', ['write-config']);
+    grunt.registerTask('install', ['write-config', 'less']);
 
     // task: test
-//    grunt.registerTask('test', ['jshint:all', 'jasmine']);
-    grunt.registerTask('test', ['jshint:all', 'jasmine', 'jasmine-node']);
+    grunt.registerTask('test', ['jshint:all', 'jasmine']);
+//    grunt.registerTask('test', ['jshint:all', 'jasmine', 'jasmine_node']);
 
     // task: set-sprint
     // Update sprint number in package.json and rewrite src/config.json
     grunt.registerTask('set-sprint', ['update-sprint-number', 'write-config']);
 
+    // task: build
+    grunt.registerTask('build', [
+        'jshint:src',
+        'jasmine',
+        'clean',
+        'less',
+        'targethtml',
+        'useminPrepare',
+        'htmlmin',
+        'requirejs',
+        'concat',
+        /*'cssmin',*/
+        /*'uglify',*/
+        'copy',
+        'usemin',
+        'build-config'
+    ]);
+
     // Default task.
     grunt.registerTask('default', ['test']);
 };