Merge remote-tracking branch 'origin/master' into randy/display-inline-editor-errors

redmunds · redmunds · commit 730a2dc7b2a4 · 2014-03-11T16:03:41.000-07:00
diff --git a/src/filesystem/FileSystem.js b/src/filesystem/FileSystem.js
@@ -350,7 +350,9 @@ define(function (require, exports, module) {
             // entries always return cached data if it exists!
             this._index.visitAll(function (child) {
                 if (child.fullPath.indexOf(entry.fullPath) === 0) {
-                    child._clearCachedData();
+                    // 'true' so entry doesn't try to clear its immediate childrens' caches too. That would be redundant
+                    // with the visitAll() here, and could be slow if we've already cleared its parent (#7150).
+                    child._clearCachedData(true);
                 }
             }.bind(this));
             
@@ -718,7 +720,8 @@ define(function (require, exports, module) {
             if (!watchedRoot || !watchedRoot.filter(directory.name, directory.parentPath)) {
                 this._index.visitAll(function (entry) {
                     if (entry.fullPath.indexOf(directory.fullPath) === 0) {
-                        entry._clearCachedData();
+                        // Passing 'true' for a similar reason as in _unwatchEntry() - see #7150
+                        entry._clearCachedData(true);
                     }
                 }.bind(this));
                 
@@ -773,7 +776,8 @@ define(function (require, exports, module) {
         if (!path) {
             // This is a "wholesale" change event; clear all caches
             this._index.visitAll(function (entry) {
-                entry._clearCachedData();
+                // Passing 'true' for a similar reason as in _unwatchEntry() - see #7150
+                entry._clearCachedData(true);
             });
             
             this._fireChangeEvent(null);
diff --git a/src/nls/README.md b/src/nls/README.md
@@ -2,9 +2,9 @@
 
 1. Create a subfolder of the `nls` folder whose name is the language or locale you want to
    create a translation for.
-    * If you're creating a general translation for a language, just use its two-letter code 
+    * If you're creating a general translation for a language, just use its two-letter code
       (e.g. `en`, `de`).
-    * If you're creating a locale-specific translation for a particular country, add a hyphen 
+    * If you're creating a locale-specific translation for a particular country, add a hyphen
       and the country code in lowercase (e.g. `en-ca`, `en-gb`).
 2. Add an entry for your translation to the `module.exports` object in `nls/strings.js`.
 3. Edit the root `strings-app.js` file and add a new `LOCALE_`* entry for your language, as seen in
@@ -22,7 +22,7 @@ Localization is provided via the [require.js i18n plugin](http://requirejs.org/d
 ### Translating the Getting Started project
 
 When first installed, Brackets will open a Getting Started project that serves
-as an introduction to Brackets features. This project can be translated by 
+as an introduction to Brackets features. This project can be translated by
 providing a ``urls.js`` file that points to a localized directory under the
 ``samples`` folder at the root of the Brackets repository. See the French
 localization (`src/nls/fr/urls.js`) for an example.
@@ -71,6 +71,7 @@ The following languages have been contributed by the Brackets community:
 * Swedish (sv)
 * Turkish (tr)
 * Simplified Chinese (zh-cn)
+* Indonesia (id)
 
 These translations _can be directly modified_ through our normal pull request
 process.
diff --git a/src/nls/id/strings.js b/src/nls/id/strings.js
diff --git a/src/nls/id/urls.js b/src/nls/id/urls.js
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2014 Adobe Systems Incorporated. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global define */
+
+define({
+    // Relative to the samples folder
+    "GETTING_STARTED"           : "id/Memulai",
+    "WEB_PLATFORM_DOCS_LICENSE" : "http://creativecommons.org/licenses/by/3.0/deed.id"
+});
diff --git a/src/nls/root/strings-app.js b/src/nls/root/strings-app.js
@@ -36,6 +36,7 @@ define({
     "LOCALE_ES"                                 : "Español",
     "LOCALE_FI"                                 : "suomi",
     "LOCALE_FR"                                 : "Français",
+    "LOCALE_ID"                                 : "Indonesia",
     "LOCALE_IT"                                 : "italiano",
     "LOCALE_JA"                                 : "日本語",
     "LOCALE_NB"                                 : "norsk",
@@ -52,5 +53,5 @@ define({
     "LOCALE_TR"                                 : "Türkçe",
     "LOCALE_ZH_CN"                              : "简体中文",
     "LOCALE_HU"                                 : "Magyar",
-    "LOCALE_KO"                                 : "한국어",
+    "LOCALE_KO"                                 : "한국어"
 });
diff --git a/src/nls/strings.js b/src/nls/strings.js
@@ -1,33 +1,33 @@
 /*
  * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
- *  
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *  
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- *  
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
+ *
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
 /*global define */
 
 define(function (require, exports, module) {
-    
+
     "use strict";
-    
+
     // Code that needs to display user strings should call require("strings") to load
     // src/strings.js. This file will dynamically load strings.js for the specified brackets.locale.
     //
@@ -41,10 +41,11 @@ define(function (require, exports, module) {
         "de": true,
         "el": true,
         "es": true,
-		"fa-ir": true,
+        "fa-ir": true,
         "fi": true,
         "fr": true,
         "hu": true,
+        "id": true,
         "it": true,
         "ja": true,
         "ko": true,
diff --git a/src/nls/urls.js b/src/nls/urls.js
@@ -40,6 +40,7 @@ define(function (require, exports, module) {
 		"fa-ir": true,
         "fi": true,
         "fr": true,
+        "id": true,
         "it": true,
         "ja": true,
         "ko": true,
diff --git a/test/spec/FileSystem-test.js b/test/spec/FileSystem-test.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, describe, it, expect, beforeEach, afterEach, waits, waitsFor, runs, $, window, jasmine */
+/*global define, describe, it, expect, beforeEach, afterEach, waits, waitsFor, waitsForDone, runs, $, window, jasmine, spyOn */
 
 define(function (require, exports, module) {
     "use strict";
@@ -32,7 +32,8 @@ define(function (require, exports, module) {
         FileSystem          = require("filesystem/FileSystem"),
         FileSystemStats     = require("filesystem/FileSystemStats"),
         FileSystemError     = require("filesystem/FileSystemError"),
-        MockFileSystemImpl  = require("./MockFileSystemImpl");
+        MockFileSystemImpl  = require("./MockFileSystemImpl"),
+        Async               = require("utils/Async");
     
     
     describe("FileSystem", function () {
@@ -1342,13 +1343,70 @@ define(function (require, exports, module) {
                 });
             });
             
-            it("should invalidate cached data after unwatch", function () {
+            it("should recursively invalidate cached data after unwatch", function () {
+                var file1       = fileSystem.getFileForPath("/file1.txt"),
+                    subdir      = fileSystem.getDirectoryForPath("/subdir"),
+                    file4       = fileSystem.getFileForPath("/subdir/file4.txt"),
+                    childSubdir = fileSystem.getDirectoryForPath("/subdir/child"),
+                    file5       = fileSystem.getFileForPath("/subdir/child/file5.txt"),
+                    entries     = [file1, subdir, file4, childSubdir, file5],
+                    unwatchCb   = errorCallback();
+                
+                runs(function () {
+                    var readAllPromise = Async.doInParallel(entries, function (entry) {
+                        // Confirm watched and no cached data yet
+                        expect(entry._isWatched()).toBe(true);
+                        expect(entry._contents).toBeFalsy();
+                        
+                        // Read contents
+                        var result = new $.Deferred(),
+                            cb = function (err, contents) {
+                                expect(err).toBeFalsy();
+                                result.resolve();
+                            };
+                        if (entry.isFile) {
+                            entry.read(cb);
+                        } else {
+                            entry.getContents(cb);
+                        }
+                        return result;
+                    });
+                        
+                    waitsForDone(readAllPromise);
+                });
+                runs(function () {
+                    // Confirm all entries now have cached data
+                    entries.forEach(function (entry) {
+                        expect(entry._contents).toBeTruthy();
+                    });
+                    
+                    // Unwatch and count how many visitAll() calls it took
+                    spyOn(fileSystem._index, "visitAll").andCallThrough();
+                    
+                    fileSystem.unwatch(fileSystem.getDirectoryForPath("/"), unwatchCb);
+                });
+                waitsFor(function () { return unwatchCb.wasCalled; });
+                
+                runs(function () {
+                    // Confirm visitAll() didn't traverse the whole index multiple times (#7150).
+                    // One call expected for _unwatchEntry() calling _clearCachedData(), one for unwatch() calling removeEntry().
+                    expect(fileSystem._index.visitAll.callCount).toBe(2);
+                    
+                    // Confirm all entries have become uncached
+                    entries.forEach(function (entry) {
+                        expect(entry._isWatched()).toBe(false);
+                        expect(entry._contents).toBeFalsy();
+                    });
+                });
+            });
+            
+            it("should invalidate cached data after unwatch, but allow read again", function () {
                 var file,
                     cb0 = readCallback(),
                     cb1 = errorCallback(),
                     cb2 = readCallback(),
                     savedHash;
-
+                
                 // confirm watched and empty cached data
                 runs(function () {
                     file = fileSystem.getFileForPath(filename);
@@ -1387,6 +1445,7 @@ define(function (require, exports, module) {
                     expect(cb2.error).toBeFalsy();
                     expect(cb2.data).toBe(cb0.data);
                     expect(file._isWatched()).toBe(false);
+                    expect(file._contents).toBeFalsy();
                     expect(file._hash).toBeTruthy();
                     expect(readCalls).toBe(2);
                 });
diff --git a/test/spec/MockFileSystemImpl.js b/test/spec/MockFileSystemImpl.js
@@ -162,7 +162,7 @@ define(function (require, exports, module) {
                 if (options.expectedContents !== _model.readFile(path)) {
                     cb(FileSystemError.CONTENTS_MODIFIED);
                     return;
-                } 
+                }
             } else {
                 cb(FileSystemError.CONTENTS_MODIFIED);
                 return;
