jEdit / Plugin Bugs / #157 SpellCheck freeze

Logged In: YES
user_id=1725856
Originator: NO

I have a patch against R004 for this bug, but I don't know how to attach it.

Here it is:
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff -r SpellCheck-R004/SpellCheck/cswilly/jeditPlugins/spell/SpellCheckOptionPane.java ./cswilly/jeditPlugins/spell/SpellCheckOptionPane.java
37a38,40
> import org.gjt.sp.util.Log;
>
> import cswilly.spell.SpellException;
60,61c63,64
< Vector values = SpellCheckPlugin.getAlternateLangDictionaries();
<
---
> Vector values = null;
>
90,97c93
< String aspellMainLanguage = jEdit.getProperty( SpellCheckPlugin.ASPELL_LANG_PROP, "" );
<
< if ( !values.contains( aspellMainLanguage ) )
< values.add( aspellMainLanguage );
<
< _aspellMainLanguageList = new JComboBox( values );
< _aspellMainLanguageList.setSelectedItem( aspellMainLanguage );
< _aspellMainLanguageList.setEditable( true );
---
> String aspellMainLanguage = jEdit.getProperty( SpellCheckPlugin.ASPELL_LANG_PROP, "" );
99c95,111
< addComponent( _aspellMainLanguageList );
---
> try{
> values = SpellCheckPlugin.getAlternateLangDictionaries();
> if (!"".equals(aspellMainLanguage) && !values.contains( aspellMainLanguage ) )
> values.add( aspellMainLanguage );
>
> _aspellMainLanguageList = new JComboBox( values );
> _aspellMainLanguageList.setSelectedItem( aspellMainLanguage );
> _aspellMainLanguageList.setEditable( true );
>
> addComponent( _aspellMainLanguageList );
> }catch(SpellException spe){
> Log.log(Log.ERROR,SpellCheckOptionPane.class,spe);
> JLabel erreur = new JLabel(jEdit.getProperty("list-dict-error.message",
> new Object[]{spe.getMessage()}));
> addComponent(erreur);
> _aspellMainLanguageList=null;
> }
159c171,174
< jEdit.setProperty( SpellCheckPlugin.ASPELL_LANG_PROP, _aspellMainLanguageList.getSelectedItem().toString().trim() );
---
> if(_aspellMainLanguageList != null)
> jEdit.setProperty( SpellCheckPlugin.ASPELL_LANG_PROP, _aspellMainLanguageList.getSelectedItem().toString().trim() );
> else
> jEdit.unsetProperty( SpellCheckPlugin.ASPELL_LANG_PROP);
diff -r SpellCheck-R004/SpellCheck/cswilly/jeditPlugins/spell/SpellCheckPlugin.java ./cswilly/jeditPlugins/spell/SpellCheckPlugin.java
26a27
> import cswilly.spell.TimeoutInputStreamNoPoll;
40a42,45
> import java.util.regex.Pattern;
> import java.util.regex.Matcher;
>
>
52a58,61
> public static final long LIST_DICTS_DEFAULT_TIMEOUT = 2000;
> public static final String LIST_DICTS_TIMEOUT_PROP = "list-dicts-timeout";
> public static final long SPELL_CHECK_DEFAULT_TIMEOUT = 5000;
> public static final String SPELL_CHECK_TIMEOUT_PROP = "spell-check-timeout";
59,60c68
< private static String aspellCommandLine;
<
---
> private static List aspellCommandLine;
62,65d69
< /**
< * Method called by jEdit to initialize the plugin.
< */
< //public void start() {}
67,96d70
< /**
< * Method called by jEdit before exiting. Usually, nothing
< * needs to be done here.
< */
< //public void stop() {}
<
< /**
< * Method called every time a view is created to set up the
< * Plugins menu. Menus and menu items should be loaded using the
< * methods in the GUIUtilities class, and added to the list.
< * @param menuItems Add menuitems here
< */
< public void createMenuItems(Vector menuItems)
< {
< menuItems.addElement( GUIUtilities.loadMenu( SPELL_CHECK_ACTIONS ) );
< }
<
< /**
< * Method called every time the plugin options dialog box is
< * displayed. Any option panes created by the plugin should be
< * added here.
< * @param optionsDialog The plugin options dialog box
< *
< * @see OptionPane
< * @see OptionsDialog#addOptionPane(OptionPane)
< */
< public void createOptionPanes(OptionsDialog optionsDialog)
< {
< optionsDialog.addOptionPane( new SpellCheckOptionPane() );
< }
165c139
< String aspellCommandLine = "";
---
> List aspellCommandLine = new ArrayList(4);
169c143
< aspellCommandLine += " --mode=sgml";
---
> aspellCommandLine.add("--mode=sgml");
172,173c146,157
< if ( !aspellMainLanguage.equals("") )
< aspellCommandLine += " --lang=" + aspellMainLanguage + " --language-tag=" + aspellMainLanguage;
---
> if ( !aspellMainLanguage.equals("") ){
> aspellCommandLine.add("--lang=" + aspellMainLanguage);
> //can't find this option, so removing:
> //aspellCommandLine.add("--language-tag=" + aspellMainLanguage);
> }
>
> if ( !aspellMainLanguage.equals("") ){
> String aspellOtherParams = getAspellOtherParams();
> for(StringTokenizer st=new StringTokenizer(aspellOtherParams);st.hasMoreTokens();){
> aspellCommandLine.add(st.nextToken());
> }
> }
175,181c159
< String aspellOtherParams = getAspellOtherParams();
< if ( !aspellMainLanguage.equals("") )
< aspellCommandLine += " " + aspellOtherParams;
<
< aspellCommandLine += " pipe";
<
< setAspellCommandLine( aspellCommandLine);
---
> aspellCommandLine.add("pipe");
182a161
> setAspellCommandLine(aspellCommandLine);
210a190
> Log.log(Log.ERROR,SpellCheckPlugin.class,"Aspell command line is: "+aspellCommandLine);
218a199
> Log.log(Log.ERROR,SpellCheckPlugin.class,"Aspell command line is: "+aspellCommandLine);
236,237c217,218
< String aspellCommandLine = getAspellCommandLine();
<
---
> String[] aspellCommandLine = (String[])getAspellCommandLine().toArray(new String[]{});
> long timeout = getSpellCheckTimeout();
242c223
< _fileSpellChecker = new FileSpellChecker( aspellExeFilename, aspellCommandLine );
---
> _fileSpellChecker = new FileSpellChecker( aspellExeFilename, aspellCommandLine, timeout );
245c226
< || !aspellCommandLine.equals( _fileSpellChecker.getAspellCommandLine() ) )
---
> || !Arrays.asList(aspellCommandLine).equals( Arrays.asList(_fileSpellChecker.getAspellCommandLine()) ) )
248c229
< _fileSpellChecker = new FileSpellChecker( aspellExeFilename, aspellCommandLine );
---
> _fileSpellChecker = new FileSpellChecker( aspellExeFilename, aspellCommandLine, timeout );
282c263
< String getAspellCommandLine()
---
> List getAspellCommandLine()
285c266
< aspellCommandLine = "";
---
> aspellCommandLine = new ArrayList();
291c272
< void setAspellCommandLine(String newCommandLine)
---
> void setAspellCommandLine(List newCommandLine)
338a320,349
> private static long getListDictionnariesTimeout(){
> long timeout = LIST_DICTS_DEFAULT_TIMEOUT;
> String stimeout = jEdit.getProperty(LIST_DICTS_TIMEOUT_PROP);
> if(stimeout != null){
> try{
> timeout = Long.parseLong(stimeout);
> }catch(NumberFormatException nfe){
> jEdit.setProperty(LIST_DICTS_TIMEOUT_PROP,String.valueOf(LIST_DICTS_DEFAULT_TIMEOUT));
> }
> }else{
> jEdit.setProperty(LIST_DICTS_TIMEOUT_PROP,String.valueOf(LIST_DICTS_DEFAULT_TIMEOUT));
> }
> return timeout;
> }
>
> private static long getSpellCheckTimeout(){
> long timeout = SPELL_CHECK_DEFAULT_TIMEOUT;
> String stimeout = jEdit.getProperty(SPELL_CHECK_TIMEOUT_PROP);
> if(stimeout != null){
> try{
> timeout = Long.parseLong(stimeout);
> }catch(NumberFormatException nfe){
> jEdit.setProperty(SPELL_CHECK_TIMEOUT_PROP,String.valueOf(SPELL_CHECK_DEFAULT_TIMEOUT));
> }
> }else{
> jEdit.setProperty(SPELL_CHECK_TIMEOUT_PROP,String.valueOf(SPELL_CHECK_DEFAULT_TIMEOUT));
> }
> return timeout;
> }
>
340c351
< Vector getAlternateLangDictionaries()
---
> Vector getAlternateLangDictionaries() throws SpellException
342d352
< String dictDirPath = null;
346,382c356,391
< try
< {
< // first we try to dump the aspell config into a BufferedReader
< BufferedReader input = new BufferedReader( new InputStreamReader( Runtime.getRuntime().exec( aspellExeFilename + " dump config" ).getInputStream() ) );
< // then we search for the dict-dir keyword to pick up its value
< while ( ( line = input.readLine() ) != null )
< {
< if ( line.indexOf( "dict-dir" ) > 0 )
< dictDirPath = line.trim().substring( line.lastIndexOf( " " ) + 1 );
< }
< input.close();
< if ( dictDirPath != null )
< {
< // ok, we have found it
< File dictDir = new File( dictDirPath );
< // now, we check that the value found is a directory...
< if ( dictDir.isDirectory() )
< {
< // ...inside which we get all installed dictionaries (all files)
< File[] langFiles = dictDir.listFiles();
< for (int i = 0; i < langFiles.length; i++)
< {
< // we remove suffix if any
< String dict = langFiles[i].getName();
< int pos = dict.lastIndexOf(".");
< if ( pos >= 0 )
< dict = dict.substring(0,pos);
< // and then add the dictionary into the vector unless it is already there
< if ( ! langs.contains(dict) )
< langs.add( dict );
< }
< }
< }
< }
< catch ( IOException e )
< {
< }
---
> Process process = null;
> try
> {
> //directly dump the aspell dicts
> long timeout = getListDictionnariesTimeout();
>
> ProcessBuilder pb = new ProcessBuilder(
> Arrays.asList(new String[]{aspellExeFilename,"dump","dicts"}));
>
> pb.redirectErrorStream(true);
>
> Log.log(Log.MESSAGE,SpellCheckPlugin.class, "Executing "+pb.command());
> process = pb.start();
>
> BufferedReader input = new BufferedReader(new InputStreamReader(
> new TimeoutInputStreamNoPoll(process.getInputStream(),timeout) ) );
>
> // each line is a dictionnary
> Pattern p = Pattern.compile("^[a-z]{2}[-\\w]*$");//at least 2 letters language code, then anything
>
> while ( ( line = input.readLine() ) != null )
> {
> if(!p.matcher(line).matches())
> throw new IOException("Suspect dictionnary name ("+line+")");
> langs.add(line);
> }
> }
> catch ( IOException e )
> {
> Log.log(Log.ERROR, SpellCheckPlugin.class, "Exception while listing dicts");
> Log.log(Log.ERROR, SpellCheckPlugin.class,e);
> throw new SpellException(e.getMessage());
> }finally{
> if(process != null)process.destroy();
> }
>
diff -r SpellCheck-R004/SpellCheck/cswilly/jeditPlugins/spell/SpellCheckPlugin.props ./cswilly/jeditPlugins/spell/SpellCheckPlugin.props
4,5c4,5
< plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.author=C. Scott Willy, L. Fiol
< plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.version=R004
---
> plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.author=C. Scott Willy, L. Fiol, Eric Le Lay
> plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.version=R004-patch-timeout
7c7,8
<
---
> plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.activate=defer
> plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.usePluginHome=true
10,11c11,12
< plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.depend.0=jedit 04.00.01.00
< plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.depend.1=jdk 1.2
---
> plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.depend.0=jedit 04.03.11.00
> plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.depend.1=jdk 1.5
13a15,16
> plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.option-pane=SpellCheck
> options.SpellCheck.code=new cswilly.jeditPlugins.spell.SpellCheckOptionPane();
28c31
< spell-check-menu=\
---
> plugin.cswilly.jeditPlugins.spell.SpellCheckPlugin.menu=\
45a49,54
>
> list-dict-error.message=<html><p style='color:red'>Unable to list dictionnaries :<br>{0}</p>
>
> ### Timeouts
> list-dict-timeout=2000
> spell-check-timeout=5000
diff -r SpellCheck-R004/SpellCheck/cswilly/spell/AspellEngine.java ./cswilly/spell/AspellEngine.java
41c41
< public AspellEngine( String aSpellCommandLine )
---
> public AspellEngine( String aspell, String[] aSpellArgs, long timeout)
43a44,46
> List l = new ArrayList(aSpellArgs.length+1);
> l.add(aspell);
> l.addAll(Arrays.asList(aSpellArgs));
46,47c49,52
< Runtime runtime = Runtime.getRuntime();
< _aSpellProcess = runtime.exec( aSpellCommandLine );
---
> ProcessBuilder pb = new ProcessBuilder(l);
> //this to allow us to catch error messages from Aspell
> pb.redirectErrorStream(true);
> _aSpellProcess = pb.start();
50c55
< new BufferedReader( new InputStreamReader( _aSpellProcess.getInputStream() ) );
---
> new BufferedReader( new InputStreamReader( new TimeoutInputStreamNoPoll(_aSpellProcess.getInputStream(), timeout)) );
55a61,65
> if(_aSpellWelcomeMsg == null){
> throw new SpellException("Can't read Aspell Welcome Message");
> }else if(_aSpellWelcomeMsg.startsWith("Error:")){
> throw new SpellException("Aspell responded : "+_aSpellWelcomeMsg);
> }
59c69
< String msg = "Cannot create aspell process.";
---
> String msg = "Cannot create aspell process.\n("+l+")";
diff -r SpellCheck-R004/SpellCheck/cswilly/spell/FileSpellChecker.java ./cswilly/spell/FileSpellChecker.java
38c38,39
< private String _aspellCommandLine;
---
> private String[] _aspellCommandLine;
> private long _aspellTimeout;
71c72
< public FileSpellChecker( String aspellExeFilename, String aspellCommandLine )
---
> public FileSpellChecker( String aspellExeFilename, String[] aspellCommandLine, long aspellTimeout )
74a76
> _aspellTimeout = aspellTimeout;
79c81
< this( "O:\\local\\aspell\\aspell.exe", "" );
---
> this( "O:\\local\\aspell\\aspell.exe",new String[]{"pipe"},2000);
138c140
< String getAspellCommandLine()
---
> String[] getAspellCommandLine()
158c160
< _spellEngine = new AspellEngine( _aspellExeFilename + _aspellCommandLine );
---
> _spellEngine = new AspellEngine( _aspellExeFilename, _aspellCommandLine, _aspellTimeout );
diff -r SpellCheck-R004/SpellCheck/cswilly/spell/TestSpellChecker.java ./cswilly/spell/TestSpellChecker.java
45c45,46
< String aSpellCommandLine = "O:\\local\\aspell\\aspell.exe pipe";
---
> String aSpellCommand ="O:\\local\\aspell\\aspell.exe";
> String[] aSpellArgs = {"pipe"};
47c48
< AspellEngine spellChecker = new AspellEngine( aSpellCommandLine );
---
> AspellEngine spellChecker = new AspellEngine( aSpellCommand, aSpellArgs, 2000 );
92c93
< changeToDialog.show();
---
> changeToDialog.setVisible(true);
diff -r SpellCheck-R004/SpellCheck/cswilly/spell/Validator.java ./cswilly/spell/Validator.java
114c114
< validationDialog.show();
---
> validationDialog.setVisible(true);
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
And a new file : cswilly/spell/TimeoutInputStreamNoPoll.java
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
/*
* $Revision: 117 $
* $Date: 2007-12-06 11:41:04 +0100 (Jeu, 06 dÃ©c 2007) $
* $Author: eric $
*
* Copyright (C) 2007 Eric Le Lay
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License Version 2, June 1991
* as published by the Free Software Foundation
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package cswilly.spell;

import java.io.*;

/**
* A class providing non indefinitely blocking read(..) methods
* It uses polling over the available() method of the given InputStream.
* It is not thread-safe in the sense that two subsequent calls to read(..,timeout),
* where timeout>0 on a blocking stream will not allways result on first call getting
* first bytes of input, and second call trailing bytes.
* But there is no shared data, and no lock what so ever.
* As polling is used, one should choose wisely the pollInterval (obviously < timeout).
* @author Eric Le Lay
*/
public class TimeoutInputStreamNoPoll extends FilterInputStream{
private long timeout;

public TimeoutInputStreamNoPoll(InputStream in, long timeout){
super(in);
this.timeout = timeout;
}

public int read(byte[] b, int off, int len) throws IOException{
//optimisation
if(in.available()>=len)return in.read(b,off,len);

InputStreamArrayWorker worker = new InputStreamArrayWorker(b,off,len);

try{
worker.start();
worker.join (timeout);
}catch(InterruptedException ie){
throw new InterruptedIOException("Read interrupted (timeout of "+timeout+"ms)");
}
if(worker.isAlive()){
throw new InterruptedIOException("Read timeout (timeout of "+timeout+"ms)");
}else if(worker.ioe != null){
throw worker.ioe;
}else{
return worker.ret;
}
}

public int read() throws IOException{
int avail = in.available();
if(avail > 0)return in.read();

InputStreamIntWorker worker = new InputStreamIntWorker();

public int available() throws IOException{
return in.available();
}

class InputStreamArrayWorker extends Thread{

private IOException ioe;

private byte[] b;
private int off;
private int len;
private int ret;

InputStreamArrayWorker(byte[] b, int off, int len){
this.b = b;
this.off = off;
this.len = len;

ioe = null;
ret = 0;
}

public void run(){
try{
ret = in.read(b,off,len);
}catch(IOException ioe){
this.ioe = ioe;
}
}

}

class InputStreamIntWorker extends Thread{

private IOException ioe;

private int ret;

InputStreamIntWorker(){
ioe = null;
ret = 0;
}

public void run(){

try{
ret = in.read();
}catch(IOException ioe){
this.ioe = ioe;
}
}

}
}
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

Tested on:
Mac OS X 10.4.9
Apple JDK 1.5.0_07
jEdit 4.3pre11
Aspell 0.60.5

SpellCheck freeze

jEdit is a programmer's text editor written in Java.

Group

Searches

Help

#157 SpellCheck freeze

Discussion