github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Preload bundled grammar paths

Browse Source
This commit is contained in:
Antonio Scandurra
2017-03-23 15:04:12 +01:00
parent 9c469eb337
commit ab1411b1d7
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
script/lib/generate-metadata.js
View File

@@ -48,7 +48,7 @@ function buildBundledPackagesMetadata () {
}
}
const packageNewMetadata = {metadata: packageMetadata, keymaps: {}, menus: {}}
const packageNewMetadata = {metadata: packageMetadata, keymaps: {}, menus: {}, grammarPaths: []}
packageNewMetadata.rootDirPath = path.relative(CONFIG.intermediateAppPath, packagePath)
@@ -79,6 +79,12 @@ function buildBundledPackagesMetadata () {
}
}
const packageGrammarsPath = path.join(packagePath, 'grammars')
for (let packageGrammarPath of fs.listSync(packageGrammarsPath, ['json', 'cson'])) {
const relativePath = path.relative(CONFIG.intermediateAppPath, packageGrammarPath)
packageNewMetadata.grammarPaths.push(relativePath)
}
const packageStyleSheetsPath = path.join(packagePath, 'styles')
let styleSheets = null
if (packageMetadata.mainStyleSheet) {
@@ -97,7 +103,7 @@ function buildBundledPackagesMetadata () {
}
packageNewMetadata.styleSheetPaths =
styleSheets.map(styleSheetPath => path.relative(packagePath, styleSheetPath))
styleSheets.map(styleSheetPath => path.relative(CONFIG.intermediateAppPath, styleSheetPath))
packages[packageMetadata.name] = packageNewMetadata
if (packageModuleCache.extensions) {

31
src/package.coffee
View File

@@ -321,7 +321,7 @@ class Package
getKeymapPaths: ->
if @bundledPackage and not @packageManager.devMode
keymapsDirPath = path.resolve(@packageManager.resourcePath, @path, 'keymaps')
keymapsDirPath = path.join(@packageManager.resourcePath, 'keymaps')
else
keymapsDirPath = path.join(@path, 'keymaps')
@@ -332,7 +332,7 @@ class Package
getMenuPaths: ->
if @bundledPackage and not @packageManager.devMode
menusDirPath = path.resolve(@packageManager.resourcePath, @path, 'menus')
menusDirPath = path.join(@packageManager.resourcePath, 'menus')
else
menusDirPath = path.join(@path, 'menus')
@@ -378,14 +378,14 @@ class Package
getStylesheetsPath: ->
if @bundledPackage and not @packageManager.devMode
path.resolve(@packageManager.resourcePath, @path, 'styles')
path.join(@packageManager.resourcePath, 'styles')
else
path.join(@path, 'styles')
getStylesheetPaths: ->
if @bundledPackage and not @packageManager.devMode and @packageManager.packagesCache[@name]?.styleSheetPaths?
styleSheetPaths = @packageManager.packagesCache[@name].styleSheetPaths
styleSheetPaths.map (styleSheetPath) => path.resolve(@packageManager.resourcePath, @path, styleSheetPath)
styleSheetPaths.map (styleSheetPath) => path.resolve(@packageManager.resourcePath, styleSheetPath)
else
stylesheetDirPath = @getStylesheetsPath()
if @metadata.mainStyleSheet
@@ -401,12 +401,14 @@ class Package
return if @grammarsLoaded
if @bundledPackage and not @packageManager.devMode
grammarsDirPath = path.resolve(@packageManager.resourcePath, @path, 'grammars')
grammarPaths = @packageManager.packagesCache[@name].grammarPaths
else
grammarsDirPath = path.join(@path, 'grammars')
grammarPaths = fs.listSync(path.join(@path, 'grammars'), ['json', 'cson'])
grammarPaths = fs.listSync(grammarsDirPath, ['json', 'cson'])
for grammarPath in grammarPaths
if @bundledPackage and not @packageManager.devMode
grammarPath = path.resolve(@packageManager.resourcePath, grammarPath)
try
grammar = @grammarRegistry.readGrammarSync(grammarPath)
grammar.packageName = @name
@@ -423,6 +425,9 @@ class Package
return Promise.resolve() if @grammarsLoaded
loadGrammar = (grammarPath, callback) =>
if @bundledPackage and not @packageManager.devMode
grammarPath = path.resolve(@packageManager.resourcePath, grammarPath)
@grammarRegistry.readGrammar grammarPath, (error, grammar) =>
if error?
detail = "#{error.message} in #{grammarPath}"
@@ -437,15 +442,15 @@ class Package
new Promise (resolve) =>
if @bundledPackage and not @packageManager.devMode
grammarsDirPath = path.resolve(@packageManager.resourcePath, @path, 'grammars')
grammarPaths = @packageManager.packagesCache[@name].grammarPaths
async.each grammarPaths, loadGrammar, -> resolve()
else
grammarsDirPath = path.join(@path, 'grammars')
fs.exists grammarsDirPath, (grammarsDirExists) ->
return resolve() unless grammarsDirExists
fs.exists grammarsDirPath, (grammarsDirExists) ->
return resolve() unless grammarsDirExists
fs.list grammarsDirPath, ['json', 'cson'], (error, grammarPaths=[]) ->
async.each grammarPaths, loadGrammar, -> resolve()
fs.list grammarsDirPath, ['json', 'cson'], (error, grammarPaths=[]) ->
async.each grammarPaths, loadGrammar, -> resolve()
loadSettings: ->
@settings = []