update project api names

This commit is contained in:
Philip Weiss
2018-02-26 15:45:56 -08:00
parent 547b067f3e
commit 48d3677664
3 changed files with 29 additions and 30 deletions

View File

@@ -274,10 +274,10 @@ describe('Project', () => {
})
})
fdescribe('atomProject', () => {
describe('atomProject', () => {
let newSettings, projectPath1, projectPath2
beforeEach(() => {
atom.project.clearAtomProject()
atom.project.replace(null)
projectPath1 = temp.mkdirSync('project-path1')
projectPath2 = temp.mkdirSync('project-path2')
newSettings = {
@@ -289,23 +289,23 @@ describe('Project', () => {
}
})
it('sets an atomproject', () => {
expect(atom.project.getAtomProjectFilePath()).toBeNull()
expect(atom.project.getProjectFilePath()).toBeNull()
expect(atom.config.get('baz')).toBeUndefined()
atom.project.replaceAtomProject(newSettings)
expect(atom.project.getAtomProjectFilePath()).toBe("originPath")
atom.project.replace(newSettings)
expect(atom.project.getProjectFilePath()).toBe("originPath")
expect(atom.project.getPaths()).toEqual([projectPath1, projectPath2])
expect(atom.config.get('baz')).toBe("buzz")
})
it('clears an atom project', () => {
expect(atom.project.getAtomProjectFilePath()).toBeNull()
it('clears an atom project through replace with no params', () => {
expect(atom.project.getProjectFilePath()).toBeNull()
expect(atom.config.get('baz')).toBeUndefined()
atom.project.replaceAtomProject(newSettings)
atom.project.replace(newSettings)
expect(atom.config.get('baz')).toBe("buzz")
expect(atom.project.getPaths()).toEqual([projectPath1, projectPath2])
expect(atom.project.getAtomProjectFilePath()).toBe("originPath")
atom.project.clearAtomProject()
expect(atom.project.getAtomProjectFilePath()).toBeNull()
expect(atom.project.getProjectFilePath()).toBe("originPath")
atom.project.replace()
expect(atom.project.getProjectFilePath()).toBeNull()
expect(atom.config.get('baz')).toBeUndefined()
expect(atom.project.getPaths()).toEqual([])
})
@@ -315,11 +315,11 @@ describe('Project', () => {
const callback = () => {
wasCalled = true
}
atom.project.onDidReplaceAtomProject(callback)
atom.project.replaceAtomProject(newSettings)
atom.project.onDidReplace(callback)
atom.project.replace(newSettings)
expect(wasCalled).toBe(true)
wasCalled = false
atom.project.clearAtomProject()
atom.project.replace()
expect(wasCalled).toBe(true)
})
})

View File

@@ -224,7 +224,7 @@ class AtomEnvironment {
this.config.resetUserSettings(userSettings)
if (projectSettings != null && projectSettings.config != null) {
this.project.replaceAtomProject(projectSettings)
this.project.replace(projectSettings)
}
this.menu.initialize({resourcePath})

View File

@@ -80,25 +80,24 @@ class Project extends Model {
// Layers the contents of an atomProject file's config
// on top of the current global config.
replaceAtomProject (newSettings) {
atom.config.resetProjectSettings(newSettings.config)
this.projectFilePath = newSettings.originPath
this.setPaths(newSettings.paths)
this.emitter.emit('replace-atom-project', newSettings)
replace (newSettings) {
if (newSettings == null) {
atom.config.clearProjectSettings()
this.setPaths([])
this.projectFilePath = null
} else {
atom.config.resetProjectSettings(newSettings.config)
this.projectFilePath = newSettings.originPath
this.setPaths(newSettings.paths)
}
this.emitter.emit('replace', newSettings)
}
onDidReplaceAtomProject (callback) {
return this.emitter.on('replace-atom-project', callback)
onDidReplace (callback) {
return this.emitter.on('replace', callback)
}
clearAtomProject () {
atom.config.clearProjectSettings()
this.setPaths([])
this.projectFilePath = null
this.emitter.emit('replace-atom-project', {})
}
getAtomProjectFilePath () {
getProjectFilePath () {
return this.projectFilePath
}