From f8ece7a3fbaaec71bc7e782427a26c923b915537 Mon Sep 17 00:00:00 2001 From: Tucker Whitehouse Date: Mon, 29 Apr 2013 15:45:49 -0400 Subject: [PATCH 1/2] Replace .isResolved & .isRejected with .state --- src/editor/CodeHintManager.js | 2 +- src/extensibility/Package.js | 2 +- src/extensions/default/HTMLCodeHints/main.js | 8 +++----- src/utils/NodeConnection.js | 2 +- .../OpenFile-perf-files/brackets-concat.js | 4 ++-- test/spec/LanguageManager-test.js | 2 +- test/spec/NodeConnection-test.js | 20 +++++++++---------- 7 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/editor/CodeHintManager.js b/src/editor/CodeHintManager.js index 9fb4973e41e..df78fc32184 100644 --- a/src/editor/CodeHintManager.js +++ b/src/editor/CodeHintManager.js @@ -340,7 +340,7 @@ define(function (require, exports, module) { if (sessionEditor) { if (sessionEditor === editor && (hintList.isOpen() || - (deferredHints && !deferredHints.isResolved() && !deferredHints.isRejected()))) { + (deferredHints && deferredHints.state() === "pending"))) { return true; } else { // the editor has changed diff --git a/src/extensibility/Package.js b/src/extensibility/Package.js index 254674ed1ca..14bff72e5fb 100644 --- a/src/extensibility/Package.js +++ b/src/extensibility/Package.js @@ -263,7 +263,7 @@ define(function (require, exports, module) { */ function cancelDownload(downloadId) { // TODO: if we're still waiting on the NodeConnection, how do we cancel? - console.assert(_nodeConnectionDeferred.isResolved()); + console.assert(_nodeConnectionDeferred.state() === "resolved"); _nodeConnectionDeferred.done(function (connection) { connection.domains.extensionManager.abortDownload(downloadId); }); diff --git a/src/extensions/default/HTMLCodeHints/main.js b/src/extensions/default/HTMLCodeHints/main.js index 2495a74391c..856cef077a7 100644 --- a/src/extensions/default/HTMLCodeHints/main.js +++ b/src/extensions/default/HTMLCodeHints/main.js @@ -287,7 +287,7 @@ define(function (require, exports, module) { self.cachedHints.queryDir = queryDir; self.cachedHints.docDir = docDir; - if (!self.cachedHints.deferred.isRejected()) { + if (self.cachedHints.deferred.state() !== "rejected") { var currentDeferred = self.cachedHints.deferred; // Since we've cached the results, the next call to _getUrlList should be synchronous. // If it isn't, we've got a problem and should reject both the current deferred @@ -296,13 +296,11 @@ define(function (require, exports, module) { if (syncResults instanceof Array) { currentDeferred.resolveWith(self, [syncResults]); } else { - if (currentDeferred && !currentDeferred.isResolved() && !currentDeferred.isRejected()) { + if (currentDeferred && currentDeferred.state() === "pending") { currentDeferred.reject(); } - if (self.cachedHints.deferred && - !self.cachedHints.deferred.isResolved() && - !self.cachedHints.deferred.isRejected()) { + if (self.cachedHints.deferred && self.cachedHints.deferred.state() === "pending") { self.cachedHints.deferred.reject(); self.cachedHints.deferred = null; } diff --git a/src/utils/NodeConnection.js b/src/utils/NodeConnection.js index 85e3dc3328e..1e48544a148 100644 --- a/src/utils/NodeConnection.js +++ b/src/utils/NodeConnection.js @@ -70,7 +70,7 @@ define(function (require, exports, module) { setDeferredTimeout(deferred, CONNECTION_TIMEOUT); brackets.app.getNodeState(function (err, nodePort) { - if (!err && nodePort && !deferred.isRejected()) { + if (!err && nodePort && deferred.state() !== "rejected") { port = nodePort; ws = new WebSocket("ws://localhost:" + port); diff --git a/test/perf/OpenFile-perf-files/brackets-concat.js b/test/perf/OpenFile-perf-files/brackets-concat.js index df244045217..36c1ffbd23e 100644 --- a/test/perf/OpenFile-perf-files/brackets-concat.js +++ b/test/perf/OpenFile-perf-files/brackets-concat.js @@ -20365,7 +20365,7 @@ define('LiveDevelopment/Inspector/Inspector',['require','exports','module'],func _connectDeferred = deferred; var promise = getAvailableSockets(); promise.done(function onGetAvailableSockets(response) { - if (deferred.isRejected()) { + if (deferred.state() === "rejected") { return; } var i, page; @@ -58619,7 +58619,7 @@ define('LiveDevelopment/Inspector/Inspector',['require','exports','module'],func _connectDeferred = deferred; var promise = getAvailableSockets(); promise.done(function onGetAvailableSockets(response) { - if (deferred.isRejected()) { + if (deferred.state() === "rejected") { return; } var i, page; diff --git a/test/spec/LanguageManager-test.js b/test/spec/LanguageManager-test.js index 6e0845d0bf4..4e7d7b6f4df 100644 --- a/test/spec/LanguageManager-test.js +++ b/test/spec/LanguageManager-test.js @@ -174,7 +174,7 @@ define(function (require, exports, module) { language = lang; }); - expect(promise.isResolved()).toBeTruthy(); + expect(promise.state() === "resolved").toBeTruthy(); validateLanguage(def, language); }); diff --git a/test/spec/NodeConnection-test.js b/test/spec/NodeConnection-test.js index b5f7d84d430..193e0d60aff 100644 --- a/test/spec/NodeConnection-test.js +++ b/test/spec/NodeConnection-test.js @@ -62,7 +62,7 @@ define(function (require, exports, module) { waitsFor( function () { return connectDeferred && - connectDeferred.isResolved() && + connectDeferred.state() === "resolved" && connection.connected(); }, "The NodeConnection should connect", @@ -93,7 +93,7 @@ define(function (require, exports, module) { }); waitsFor( function () { - return loadDeferred && loadDeferred.isResolved(); + return loadDeferred && loadDeferred.state() === "resolved"; }, "The load should complete", CONNECTION_TIMEOUT @@ -127,15 +127,13 @@ define(function (require, exports, module) { ); waitsFor( function () { - return loadDeferred && - (loadDeferred.isRejected() || - loadDeferred.isResolved()); + return loadDeferred && loadDeferred.state() !== "pending"; }, CONNECTION_TIMEOUT ); runs( function () { - expect(loadDeferred.isRejected()).toBe(true); + expect(loadDeferred.state() === "rejected").toBe(true); expect(connection.connected()).toBe(true); expect(connection._port).toBe(port); } @@ -157,7 +155,7 @@ define(function (require, exports, module) { waitsFor( function () { return commandDeferred && - commandDeferred.isResolved() && + commandDeferred.state() === "resolved" && result; }, CONNECTION_TIMEOUT @@ -182,7 +180,7 @@ define(function (require, exports, module) { waitsFor( function () { return commandDeferred && - commandDeferred.isResolved() && + commandDeferred.state() === "resolved" && result; }, CONNECTION_TIMEOUT @@ -230,7 +228,7 @@ define(function (require, exports, module) { waitsFor( function () { return commandDeferred && - commandDeferred.isRejected() && + commandDeferred.state() === "rejected" && result; }, CONNECTION_TIMEOUT @@ -249,7 +247,7 @@ define(function (require, exports, module) { waitsFor( function () { return commandDeferred && - commandDeferred.isResolved() && + commandDeferred.state() === "resolved" && result; }, CONNECTION_TIMEOUT @@ -276,7 +274,7 @@ define(function (require, exports, module) { waitsFor( function () { return commandDeferred && - commandDeferred.isResolved() && + commandDeferred.state() === "resolved" && result; }, CONNECTION_TIMEOUT From fbbc31a13e1f3dc3b6bd70ac910406c2d916cb28 Mon Sep 17 00:00:00 2001 From: Tucker Whitehouse Date: Tue, 30 Apr 2013 17:29:57 -0400 Subject: [PATCH 2/2] Revert changes of .isRejected & .isResolved --- test/perf/OpenFile-perf-files/brackets-concat.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/perf/OpenFile-perf-files/brackets-concat.js b/test/perf/OpenFile-perf-files/brackets-concat.js index 36c1ffbd23e..df244045217 100644 --- a/test/perf/OpenFile-perf-files/brackets-concat.js +++ b/test/perf/OpenFile-perf-files/brackets-concat.js @@ -20365,7 +20365,7 @@ define('LiveDevelopment/Inspector/Inspector',['require','exports','module'],func _connectDeferred = deferred; var promise = getAvailableSockets(); promise.done(function onGetAvailableSockets(response) { - if (deferred.state() === "rejected") { + if (deferred.isRejected()) { return; } var i, page; @@ -58619,7 +58619,7 @@ define('LiveDevelopment/Inspector/Inspector',['require','exports','module'],func _connectDeferred = deferred; var promise = getAvailableSockets(); promise.done(function onGetAvailableSockets(response) { - if (deferred.state() === "rejected") { + if (deferred.isRejected()) { return; } var i, page;