diff --git a/src/app/config.coffee b/src/app/config.coffee index a3eaf566c..f55987d46 100644 --- a/src/app/config.coffee +++ b/src/app/config.coffee @@ -5,10 +5,10 @@ EventEmitter = require 'event-emitter' configDirPath = fs.absolute("~/.atom") configJsonPath = fs.join(configDirPath, "config.json") userInitScriptPath = fs.join(configDirPath, "atom.coffee") -bundledExtensionsDirPath = fs.join(resourcePath, "src/extensions") -userExtensionsDirPath = fs.join(configDirPath, "extensions") +bundledPackagesDirPath = fs.join(resourcePath, "src/packages") +userPackagesDirPath = fs.join(configDirPath, "packages") -require.paths.unshift userExtensionsDirPath +require.paths.unshift userPackagesDirPath module.exports = class Config @@ -32,17 +32,17 @@ class Config @setDefaults "core", require('root-view').configDefaults @setDefaults "editor", require('editor').configDefaults - getAvailableExtensions: -> - availableExtensions = - fs.list(bundledExtensionsDirPath) - .concat(fs.list(userExtensionsDirPath)).map (path) -> fs.base(path) - _.unique(availableExtensions) + getAvailablePackages: -> + availablePackages = + fs.list(bundledPackagesDirPath) + .concat(fs.list(userPackagesDirPath)).map (path) -> fs.base(path) + _.unique(availablePackages) loadPackages: -> - disabledExtensions = config.get("core.disabledExtensions") ? [] - for extensionName in @getAvailableExtensions() - unless _.contains disabledExtensions, extensionName - atom.loadPackage(extensionName) + disabledPackages = config.get("core.disabledPackages") ? [] + for packageName in @getAvailablePackages() + unless _.contains disabledPackages, packageName + atom.loadPackage(packageName) get: (keyPath) -> keys = @keysForKeyPath(keyPath) diff --git a/src/app/root-view.coffee b/src/app/root-view.coffee index 800f80178..7a761e469 100644 --- a/src/app/root-view.coffee +++ b/src/app/root-view.coffee @@ -17,7 +17,7 @@ module.exports = class RootView extends View @configDefaults: ignoredNames: [".git", ".svn", ".DS_Store"] - disabledExtensions: [] + disabledPackages: [] @content: -> @div id: 'root-view', tabindex: -1, => diff --git a/src/extensions/autocomplete/index.coffee b/src/packages/autocomplete/index.coffee similarity index 100% rename from src/extensions/autocomplete/index.coffee rename to src/packages/autocomplete/index.coffee diff --git a/src/extensions/autocomplete/spec/autocomplete-spec.coffee b/src/packages/autocomplete/spec/autocomplete-spec.coffee similarity index 100% rename from src/extensions/autocomplete/spec/autocomplete-spec.coffee rename to src/packages/autocomplete/spec/autocomplete-spec.coffee diff --git a/src/extensions/autocomplete/src/autocomplete.coffee b/src/packages/autocomplete/src/autocomplete.coffee similarity index 100% rename from src/extensions/autocomplete/src/autocomplete.coffee rename to src/packages/autocomplete/src/autocomplete.coffee diff --git a/src/extensions/autocomplete/src/keymap.coffee b/src/packages/autocomplete/src/keymap.coffee similarity index 100% rename from src/extensions/autocomplete/src/keymap.coffee rename to src/packages/autocomplete/src/keymap.coffee diff --git a/src/extensions/command-panel/commands.pegjs b/src/packages/command-panel/commands.pegjs similarity index 100% rename from src/extensions/command-panel/commands.pegjs rename to src/packages/command-panel/commands.pegjs diff --git a/src/extensions/command-panel/index.coffee b/src/packages/command-panel/index.coffee similarity index 100% rename from src/extensions/command-panel/index.coffee rename to src/packages/command-panel/index.coffee diff --git a/src/extensions/command-panel/spec/command-interpreter-spec.coffee b/src/packages/command-panel/spec/command-interpreter-spec.coffee similarity index 100% rename from src/extensions/command-panel/spec/command-interpreter-spec.coffee rename to src/packages/command-panel/spec/command-interpreter-spec.coffee diff --git a/src/extensions/command-panel/spec/command-panel-spec.coffee b/src/packages/command-panel/spec/command-panel-spec.coffee similarity index 100% rename from src/extensions/command-panel/spec/command-panel-spec.coffee rename to src/packages/command-panel/spec/command-panel-spec.coffee diff --git a/src/extensions/command-panel/src/command-interpreter.coffee b/src/packages/command-panel/src/command-interpreter.coffee similarity index 100% rename from src/extensions/command-panel/src/command-interpreter.coffee rename to src/packages/command-panel/src/command-interpreter.coffee diff --git a/src/extensions/command-panel/src/command-panel.coffee b/src/packages/command-panel/src/command-panel.coffee similarity index 100% rename from src/extensions/command-panel/src/command-panel.coffee rename to src/packages/command-panel/src/command-panel.coffee diff --git a/src/extensions/command-panel/src/commands/address-range.coffee b/src/packages/command-panel/src/commands/address-range.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/address-range.coffee rename to src/packages/command-panel/src/commands/address-range.coffee diff --git a/src/extensions/command-panel/src/commands/address.coffee b/src/packages/command-panel/src/commands/address.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/address.coffee rename to src/packages/command-panel/src/commands/address.coffee diff --git a/src/extensions/command-panel/src/commands/command.coffee b/src/packages/command-panel/src/commands/command.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/command.coffee rename to src/packages/command-panel/src/commands/command.coffee diff --git a/src/extensions/command-panel/src/commands/composite-command.coffee b/src/packages/command-panel/src/commands/composite-command.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/composite-command.coffee rename to src/packages/command-panel/src/commands/composite-command.coffee diff --git a/src/extensions/command-panel/src/commands/current-selection-address.coffee b/src/packages/command-panel/src/commands/current-selection-address.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/current-selection-address.coffee rename to src/packages/command-panel/src/commands/current-selection-address.coffee diff --git a/src/extensions/command-panel/src/commands/default-address-range.coffee b/src/packages/command-panel/src/commands/default-address-range.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/default-address-range.coffee rename to src/packages/command-panel/src/commands/default-address-range.coffee diff --git a/src/extensions/command-panel/src/commands/eof-address.coffee b/src/packages/command-panel/src/commands/eof-address.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/eof-address.coffee rename to src/packages/command-panel/src/commands/eof-address.coffee diff --git a/src/extensions/command-panel/src/commands/line-address.coffee b/src/packages/command-panel/src/commands/line-address.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/line-address.coffee rename to src/packages/command-panel/src/commands/line-address.coffee diff --git a/src/extensions/command-panel/src/commands/regex-address.coffee b/src/packages/command-panel/src/commands/regex-address.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/regex-address.coffee rename to src/packages/command-panel/src/commands/regex-address.coffee diff --git a/src/extensions/command-panel/src/commands/select-all-matches-in-project.coffee b/src/packages/command-panel/src/commands/select-all-matches-in-project.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/select-all-matches-in-project.coffee rename to src/packages/command-panel/src/commands/select-all-matches-in-project.coffee diff --git a/src/extensions/command-panel/src/commands/select-all-matches.coffee b/src/packages/command-panel/src/commands/select-all-matches.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/select-all-matches.coffee rename to src/packages/command-panel/src/commands/select-all-matches.coffee diff --git a/src/extensions/command-panel/src/commands/substitution.coffee b/src/packages/command-panel/src/commands/substitution.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/substitution.coffee rename to src/packages/command-panel/src/commands/substitution.coffee diff --git a/src/extensions/command-panel/src/commands/zero-address.coffee b/src/packages/command-panel/src/commands/zero-address.coffee similarity index 100% rename from src/extensions/command-panel/src/commands/zero-address.coffee rename to src/packages/command-panel/src/commands/zero-address.coffee diff --git a/src/extensions/command-panel/src/keymap.coffee b/src/packages/command-panel/src/keymap.coffee similarity index 100% rename from src/extensions/command-panel/src/keymap.coffee rename to src/packages/command-panel/src/keymap.coffee diff --git a/src/extensions/command-panel/src/operation.coffee b/src/packages/command-panel/src/operation.coffee similarity index 100% rename from src/extensions/command-panel/src/operation.coffee rename to src/packages/command-panel/src/operation.coffee diff --git a/src/extensions/command-panel/src/preview-list.coffee b/src/packages/command-panel/src/preview-list.coffee similarity index 100% rename from src/extensions/command-panel/src/preview-list.coffee rename to src/packages/command-panel/src/preview-list.coffee diff --git a/src/extensions/event-palette/event-palette.css b/src/packages/event-palette/event-palette.css similarity index 100% rename from src/extensions/event-palette/event-palette.css rename to src/packages/event-palette/event-palette.css diff --git a/src/extensions/event-palette/index.coffee b/src/packages/event-palette/index.coffee similarity index 100% rename from src/extensions/event-palette/index.coffee rename to src/packages/event-palette/index.coffee diff --git a/src/extensions/event-palette/spec/event-palette-spec.coffee b/src/packages/event-palette/spec/event-palette-spec.coffee similarity index 100% rename from src/extensions/event-palette/spec/event-palette-spec.coffee rename to src/packages/event-palette/spec/event-palette-spec.coffee diff --git a/src/extensions/event-palette/src/event-palette.coffee b/src/packages/event-palette/src/event-palette.coffee similarity index 100% rename from src/extensions/event-palette/src/event-palette.coffee rename to src/packages/event-palette/src/event-palette.coffee diff --git a/src/extensions/event-palette/src/keymap.coffee b/src/packages/event-palette/src/keymap.coffee similarity index 100% rename from src/extensions/event-palette/src/keymap.coffee rename to src/packages/event-palette/src/keymap.coffee diff --git a/src/extensions/fuzzy-finder/index.coffee b/src/packages/fuzzy-finder/index.coffee similarity index 100% rename from src/extensions/fuzzy-finder/index.coffee rename to src/packages/fuzzy-finder/index.coffee diff --git a/src/extensions/fuzzy-finder/spec/fuzzy-finder-spec.coffee b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee similarity index 100% rename from src/extensions/fuzzy-finder/spec/fuzzy-finder-spec.coffee rename to src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee diff --git a/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee b/src/packages/fuzzy-finder/src/fuzzy-finder.coffee similarity index 100% rename from src/extensions/fuzzy-finder/src/fuzzy-finder.coffee rename to src/packages/fuzzy-finder/src/fuzzy-finder.coffee diff --git a/src/extensions/fuzzy-finder/src/keymap.coffee b/src/packages/fuzzy-finder/src/keymap.coffee similarity index 100% rename from src/extensions/fuzzy-finder/src/keymap.coffee rename to src/packages/fuzzy-finder/src/keymap.coffee diff --git a/src/extensions/markdown-preview/index.coffee b/src/packages/markdown-preview/index.coffee similarity index 100% rename from src/extensions/markdown-preview/index.coffee rename to src/packages/markdown-preview/index.coffee diff --git a/src/extensions/markdown-preview/spec/markdown-preview-spec.coffee b/src/packages/markdown-preview/spec/markdown-preview-spec.coffee similarity index 100% rename from src/extensions/markdown-preview/spec/markdown-preview-spec.coffee rename to src/packages/markdown-preview/spec/markdown-preview-spec.coffee diff --git a/src/extensions/markdown-preview/src/keymap.coffee b/src/packages/markdown-preview/src/keymap.coffee similarity index 100% rename from src/extensions/markdown-preview/src/keymap.coffee rename to src/packages/markdown-preview/src/keymap.coffee diff --git a/src/extensions/markdown-preview/src/markdown-preview.coffee b/src/packages/markdown-preview/src/markdown-preview.coffee similarity index 100% rename from src/extensions/markdown-preview/src/markdown-preview.coffee rename to src/packages/markdown-preview/src/markdown-preview.coffee diff --git a/src/extensions/outline-view/index.coffee b/src/packages/outline-view/index.coffee similarity index 100% rename from src/extensions/outline-view/index.coffee rename to src/packages/outline-view/index.coffee diff --git a/src/extensions/outline-view/spec/outline-view-spec.coffee b/src/packages/outline-view/spec/outline-view-spec.coffee similarity index 100% rename from src/extensions/outline-view/spec/outline-view-spec.coffee rename to src/packages/outline-view/spec/outline-view-spec.coffee diff --git a/src/extensions/outline-view/src/keymap.coffee b/src/packages/outline-view/src/keymap.coffee similarity index 100% rename from src/extensions/outline-view/src/keymap.coffee rename to src/packages/outline-view/src/keymap.coffee diff --git a/src/extensions/outline-view/src/outline-view.coffee b/src/packages/outline-view/src/outline-view.coffee similarity index 100% rename from src/extensions/outline-view/src/outline-view.coffee rename to src/packages/outline-view/src/outline-view.coffee diff --git a/src/extensions/outline-view/src/outline-view.css b/src/packages/outline-view/src/outline-view.css similarity index 100% rename from src/extensions/outline-view/src/outline-view.css rename to src/packages/outline-view/src/outline-view.css diff --git a/src/extensions/outline-view/src/tag-generator.coffee b/src/packages/outline-view/src/tag-generator.coffee similarity index 100% rename from src/extensions/outline-view/src/tag-generator.coffee rename to src/packages/outline-view/src/tag-generator.coffee diff --git a/src/extensions/outline-view/src/tag-reader.coffee b/src/packages/outline-view/src/tag-reader.coffee similarity index 100% rename from src/extensions/outline-view/src/tag-reader.coffee rename to src/packages/outline-view/src/tag-reader.coffee diff --git a/src/extensions/snippets/index.coffee b/src/packages/snippets/index.coffee similarity index 100% rename from src/extensions/snippets/index.coffee rename to src/packages/snippets/index.coffee diff --git a/src/extensions/snippets/snippets.pegjs b/src/packages/snippets/snippets.pegjs similarity index 100% rename from src/extensions/snippets/snippets.pegjs rename to src/packages/snippets/snippets.pegjs diff --git a/src/extensions/snippets/spec/snippets-spec.coffee b/src/packages/snippets/spec/snippets-spec.coffee similarity index 100% rename from src/extensions/snippets/spec/snippets-spec.coffee rename to src/packages/snippets/spec/snippets-spec.coffee diff --git a/src/extensions/snippets/src/keymap.coffee b/src/packages/snippets/src/keymap.coffee similarity index 100% rename from src/extensions/snippets/src/keymap.coffee rename to src/packages/snippets/src/keymap.coffee diff --git a/src/extensions/snippets/src/snippet-expansion.coffee b/src/packages/snippets/src/snippet-expansion.coffee similarity index 100% rename from src/extensions/snippets/src/snippet-expansion.coffee rename to src/packages/snippets/src/snippet-expansion.coffee diff --git a/src/extensions/snippets/src/snippet.coffee b/src/packages/snippets/src/snippet.coffee similarity index 100% rename from src/extensions/snippets/src/snippet.coffee rename to src/packages/snippets/src/snippet.coffee diff --git a/src/extensions/snippets/src/snippets.coffee b/src/packages/snippets/src/snippets.coffee similarity index 93% rename from src/extensions/snippets/src/snippets.coffee rename to src/packages/snippets/src/snippets.coffee index 9565bc520..3d5fd2fa0 100644 --- a/src/extensions/snippets/src/snippets.coffee +++ b/src/packages/snippets/src/snippets.coffee @@ -6,7 +6,7 @@ SnippetExpansion = require 'snippets/src/snippet-expansion' module.exports = name: 'Snippets' snippetsByExtension: {} - snippetsParser: PEG.buildParser(fs.read(require.resolve 'extensions/snippets/snippets.pegjs'), trackLineAndColumn: true) + snippetsParser: PEG.buildParser(fs.read(require.resolve 'snippets/snippets.pegjs'), trackLineAndColumn: true) activate: (@rootView) -> @loadSnippets() diff --git a/src/extensions/strip-trailing-whitespace/index.coffee b/src/packages/strip-trailing-whitespace/index.coffee similarity index 100% rename from src/extensions/strip-trailing-whitespace/index.coffee rename to src/packages/strip-trailing-whitespace/index.coffee diff --git a/src/extensions/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee b/src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee similarity index 100% rename from src/extensions/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee rename to src/packages/strip-trailing-whitespace/spec/strip-trailing-whitespace-spec.coffee diff --git a/src/extensions/strip-trailing-whitespace/src/strip-trailing-whitespace.coffee b/src/packages/strip-trailing-whitespace/src/strip-trailing-whitespace.coffee similarity index 100% rename from src/extensions/strip-trailing-whitespace/src/strip-trailing-whitespace.coffee rename to src/packages/strip-trailing-whitespace/src/strip-trailing-whitespace.coffee diff --git a/src/extensions/tabs/index.coffee b/src/packages/tabs/index.coffee similarity index 100% rename from src/extensions/tabs/index.coffee rename to src/packages/tabs/index.coffee diff --git a/src/extensions/tabs/spec/tabs-spec.coffee b/src/packages/tabs/spec/tabs-spec.coffee similarity index 100% rename from src/extensions/tabs/spec/tabs-spec.coffee rename to src/packages/tabs/spec/tabs-spec.coffee diff --git a/src/extensions/tabs/src/tab.coffee b/src/packages/tabs/src/tab.coffee similarity index 100% rename from src/extensions/tabs/src/tab.coffee rename to src/packages/tabs/src/tab.coffee diff --git a/src/extensions/tabs/src/tabs.coffee b/src/packages/tabs/src/tabs.coffee similarity index 100% rename from src/extensions/tabs/src/tabs.coffee rename to src/packages/tabs/src/tabs.coffee diff --git a/src/extensions/tabs/src/tabs.css b/src/packages/tabs/src/tabs.css similarity index 100% rename from src/extensions/tabs/src/tabs.css rename to src/packages/tabs/src/tabs.css diff --git a/src/extensions/tree-view/index.coffee b/src/packages/tree-view/index.coffee similarity index 100% rename from src/extensions/tree-view/index.coffee rename to src/packages/tree-view/index.coffee diff --git a/src/extensions/tree-view/spec/tree-view-spec.coffee b/src/packages/tree-view/spec/tree-view-spec.coffee similarity index 100% rename from src/extensions/tree-view/spec/tree-view-spec.coffee rename to src/packages/tree-view/spec/tree-view-spec.coffee diff --git a/src/extensions/tree-view/src/dialog.coffee b/src/packages/tree-view/src/dialog.coffee similarity index 100% rename from src/extensions/tree-view/src/dialog.coffee rename to src/packages/tree-view/src/dialog.coffee diff --git a/src/extensions/tree-view/src/directory-view.coffee b/src/packages/tree-view/src/directory-view.coffee similarity index 100% rename from src/extensions/tree-view/src/directory-view.coffee rename to src/packages/tree-view/src/directory-view.coffee diff --git a/src/extensions/tree-view/src/file-view.coffee b/src/packages/tree-view/src/file-view.coffee similarity index 100% rename from src/extensions/tree-view/src/file-view.coffee rename to src/packages/tree-view/src/file-view.coffee diff --git a/src/extensions/tree-view/src/keymap.coffee b/src/packages/tree-view/src/keymap.coffee similarity index 100% rename from src/extensions/tree-view/src/keymap.coffee rename to src/packages/tree-view/src/keymap.coffee diff --git a/src/extensions/tree-view/src/tree-view.coffee b/src/packages/tree-view/src/tree-view.coffee similarity index 100% rename from src/extensions/tree-view/src/tree-view.coffee rename to src/packages/tree-view/src/tree-view.coffee diff --git a/src/extensions/wrap-guide/index.coffee b/src/packages/wrap-guide/index.coffee similarity index 100% rename from src/extensions/wrap-guide/index.coffee rename to src/packages/wrap-guide/index.coffee diff --git a/src/extensions/wrap-guide/spec/wrap-guide-spec.coffee b/src/packages/wrap-guide/spec/wrap-guide-spec.coffee similarity index 100% rename from src/extensions/wrap-guide/spec/wrap-guide-spec.coffee rename to src/packages/wrap-guide/spec/wrap-guide-spec.coffee diff --git a/src/extensions/wrap-guide/src/wrap-guide.coffee b/src/packages/wrap-guide/src/wrap-guide.coffee similarity index 100% rename from src/extensions/wrap-guide/src/wrap-guide.coffee rename to src/packages/wrap-guide/src/wrap-guide.coffee diff --git a/src/stdlib/require.coffee b/src/stdlib/require.coffee index 748038ce9..362fc2af2 100644 --- a/src/stdlib/require.coffee +++ b/src/stdlib/require.coffee @@ -3,7 +3,7 @@ paths = [ "#{window.resourcePath}/benchmark" "#{window.resourcePath}/src/stdlib" "#{window.resourcePath}/src/app" - "#{window.resourcePath}/src/extensions" + "#{window.resourcePath}/src/packages" "#{window.resourcePath}/src" "#{window.resourcePath}/vendor" "#{window.resourcePath}/static"