From d8de32107479925e1531313518be2ce410d5721c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 12 Jun 2013 18:28:25 -0700 Subject: [PATCH] Rename readObject() to readObjectSync() --- src/app/atom-package.coffee | 2 +- src/app/atom-theme.coffee | 2 +- src/app/text-mate-grammar.coffee | 4 ++-- src/app/text-mate-package.coffee | 4 ++-- src/stdlib/fs-utils.coffee | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/atom-package.coffee b/src/app/atom-package.coffee index d8ef8bdae..a574a7d2e 100644 --- a/src/app/atom-package.coffee +++ b/src/app/atom-package.coffee @@ -92,7 +92,7 @@ class AtomPackage extends Package @scopedProperties = [] scopedPropertiessDirPath = path.join(@path, 'scoped-properties') for scopedPropertiesPath in fsUtils.listSync(scopedPropertiessDirPath, ['.json', '.cson']) - for selector, properties of fsUtils.readObject(scopedPropertiesPath) + for selector, properties of fsUtils.readObjectSync(scopedPropertiesPath) @scopedProperties.push([scopedPropertiesPath, selector, properties]) serialize: -> diff --git a/src/app/atom-theme.coffee b/src/app/atom-theme.coffee index 071520fd6..372701cbe 100644 --- a/src/app/atom-theme.coffee +++ b/src/app/atom-theme.coffee @@ -19,7 +19,7 @@ class AtomTheme extends Theme else metadataPath = fsUtils.resolveExtension(path.join(@path, 'package'), ['cson', 'json']) if fsUtils.isFileSync(metadataPath) - stylesheetNames = fsUtils.readObject(metadataPath)?.stylesheets + stylesheetNames = fsUtils.readObjectSync(metadataPath)?.stylesheets if stylesheetNames for name in stylesheetNames filename = fsUtils.resolveExtension(path.join(@path, name), ['.css', '.less', '']) diff --git a/src/app/text-mate-grammar.coffee b/src/app/text-mate-grammar.coffee index cad4cb0bb..e5957acea 100644 --- a/src/app/text-mate-grammar.coffee +++ b/src/app/text-mate-grammar.coffee @@ -16,14 +16,14 @@ class TextMateGrammar fsUtils.readPlist(path) @load: (path, done) -> - fsUtils.readObjectAsync path, (err, object) -> + fsUtils.readObject path, (err, object) -> if err done(err) else done(null, new TextMateGrammar(object)) @loadSync: (path) -> - new TextMateGrammar(fsUtils.readObject(path)) + new TextMateGrammar(fsUtils.readObjectSync(path)) name: null rawPatterns: null diff --git a/src/app/text-mate-package.coffee b/src/app/text-mate-package.coffee index f1aebc092..61cb6dfc3 100644 --- a/src/app/text-mate-package.coffee +++ b/src/app/text-mate-package.coffee @@ -95,7 +95,7 @@ class TextMatePackage extends Package @scopedProperties.push({selector, properties}) for preferencePath in fsUtils.listSync(@getPreferencesPath()) - {scope, settings} = fsUtils.readObject(preferencePath) + {scope, settings} = fsUtils.readObjectSync(preferencePath) if properties = @propertiesFromTextMateSettings(settings) selector = syntax.cssSelectorFromScopeSelector(scope) if scope? @scopedProperties.push({selector, properties}) @@ -136,7 +136,7 @@ class TextMatePackage extends Package return loadPreferencesAtPath = (preferencePath, done) -> - fsUtils.readObjectAsync preferencePath, (error, preferences) => + fsUtils.readObject preferencePath, (error, preferences) => if error? console.warn("Failed to parse preference at path '#{preferencePath}'", error.stack, error) else diff --git a/src/stdlib/fs-utils.coffee b/src/stdlib/fs-utils.coffee index f0bda1fda..4240a2de8 100644 --- a/src/stdlib/fs-utils.coffee +++ b/src/stdlib/fs-utils.coffee @@ -300,14 +300,14 @@ module.exports = catch err done(err) - readObject: (path) -> + readObjectSync: (path) -> CSON = require 'season' if CSON.isObjectPath(path) CSON.readFileSync(path) else @readPlist(path) - readObjectAsync: (path, done) -> + readObject: (path, done) -> CSON = require 'season' if CSON.isObjectPath(path) CSON.readFile(path, done)