Permalink
Browse files

avoid new lines in expressions

  • Loading branch information...
1 parent 2657fc2 commit b9f79b5b5e60a2ce58ab523b359fec63d7e73b3e @JPMoresmau committed Jan 28, 2014
View
6 ...sf.eclipsefp.haskell.buildwrapper/src/net/sf/eclipsefp/haskell/buildwrapper/BWFacade.java
@@ -348,7 +348,6 @@ private void addEditorStanza(IFile file,List<String> command){
public Collection<NameDef> build1LongRunning(IFile file,IDocument d,boolean end){
//BuildFlagInfo i=getBuildFlags(file);
//BuildWrapperPlugin.logInfo("build1LongRunning");
-
if (bwPath==null){
if (!showedNoExeError){
BuildWrapperPlugin.logError(BWText.error_noexe, null);
@@ -858,7 +857,6 @@ public void registerOutline(IFile file,OutlineResult or){
public List<TokenDef> tokenTypes(IFile file){
//long t0=System.currentTimeMillis();
-
JSONArray arr=null;
if (runningFiles.add(file)){
Process p=buildProcesses.get(file);
@@ -871,7 +869,7 @@ public void registerOutline(IFile file,OutlineResult or){
}
//BuildWrapperPlugin.logInfo("tokenTypes longrunning");
} catch (IOException ioe){
- BuildWrapperPlugin.logError(BWText.process_launch_error, ioe);
+ //BuildWrapperPlugin.logError(BWText.process_launch_error, ioe);
} finally {
//BuildWrapperPlugin.logInfo("tokenTypes longrunning end");
runningFiles.remove(file);
@@ -1948,7 +1946,9 @@ public File getSandboxPath(){
* @return a (possibly multiple) list of results
*/
public List<EvalResult> eval(IFile file,String expression){
+
long t0=System.currentTimeMillis();
+ expression=expression.replace('\n', ' ').replace('\r',' ');
JSONArray arr=null;
if (runningFiles.add(file)){
try {

0 comments on commit b9f79b5

Please sign in to comment.