aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/PscIde.js13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/PscIde.js b/src/PscIde.js
index c9d0cfa..b0b56a8 100644
--- a/src/PscIde.js
+++ b/src/PscIde.js
@@ -77,10 +77,7 @@ function connect(psModule) {
77 if (!cache.ideServer && number === 9) { 77 if (!cache.ideServer && number === 9) {
78 debug(error) 78 debug(error)
79 79
80 console.log( 80 console.warn('Failed to connect to or start psc-ide-server. A full compilation will occur on rebuild');
81 'failed to connect to or start psc-ide-server, ' +
82 'full compilation will occur on rebuild'
83 )
84 81
85 return Promise.resolve(psModule) 82 return Promise.resolve(psModule)
86 } 83 }
@@ -133,9 +130,7 @@ function rebuild(psModule) {
133 } 130 }
134 131
135 if (res && !Array.isArray(res.result)) { 132 if (res && !Array.isArray(res.result)) {
136 return res.resultType === 'success' 133 return resolve(psModule);
137 ? resolve(psModule)
138 : reject(new Error('psc-ide rebuild failed'))
139 } 134 }
140 135
141 Promise.map(res.result, (item, i) => { 136 Promise.map(res.result, (item, i) => {
@@ -153,10 +148,10 @@ function rebuild(psModule) {
153 })) 148 }))
154 .then(() => request({ command: 'load' })) 149 .then(() => request({ command: 'load' }))
155 .then(resolve) 150 .then(resolve)
156 .catch(() => reject(new Error('psc-ide rebuild failed'))) 151 .catch(() => resolve(psModule))
157 } 152 }
158 cache.errors = compileMessages.join('\n') 153 cache.errors = compileMessages.join('\n')
159 reject(new Error('psc-ide rebuild failed')) 154 resolve(psModule);
160 } else { 155 } else {
161 cache.warnings = compileMessages.join('\n') 156 cache.warnings = compileMessages.join('\n')
162 resolve(psModule) 157 resolve(psModule)