fix prettyprinter bug
parent
0319645ff6
commit
7f92f0df6a
|
@ -1,7 +1,5 @@
|
||||||
72/73:
|
72/73:
|
||||||
|
|
||||||
- keep a list of getter/setter words
|
|
||||||
- default constructor
|
|
||||||
- move tuple to generic vocab
|
- move tuple to generic vocab
|
||||||
- update plugin docs
|
- update plugin docs
|
||||||
- extract word keeps indent
|
- extract word keeps indent
|
||||||
|
|
|
@ -203,7 +203,11 @@ public class FactorShell extends Shell
|
||||||
output.print(console.getInfoColor(),
|
output.print(console.getInfoColor(),
|
||||||
jEdit.getProperty("factor.shell.opening"));
|
jEdit.getProperty("factor.shell.opening"));
|
||||||
|
|
||||||
stream = FactorPlugin.getExternalInstance().openStream();
|
stream = null;
|
||||||
|
ExternalFactor external = FactorPlugin.getExternalInstance();
|
||||||
|
if(external != null)
|
||||||
|
stream = external.openStream();
|
||||||
|
|
||||||
if(stream == null)
|
if(stream == null)
|
||||||
{
|
{
|
||||||
output.print(console.getInfoColor(),
|
output.print(console.getInfoColor(),
|
||||||
|
|
|
@ -134,6 +134,9 @@ public class WordPreview implements ActionListener, CaretListener
|
||||||
if(SideKickPlugin.isParsingBuffer(view.getBuffer()))
|
if(SideKickPlugin.isParsingBuffer(view.getBuffer()))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if(!view.getBuffer().isLoaded())
|
||||||
|
return;
|
||||||
|
|
||||||
FactorParsedData data = FactorPlugin.getParsedData(view);
|
FactorParsedData data = FactorPlugin.getParsedData(view);
|
||||||
if(data != null)
|
if(data != null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -107,9 +107,13 @@ M: word prettyprint* ( indent word -- indent )
|
||||||
] ifte ;
|
] ifte ;
|
||||||
|
|
||||||
M: list prettyprint* ( indent list -- indent )
|
M: list prettyprint* ( indent list -- indent )
|
||||||
|
[
|
||||||
[
|
[
|
||||||
\ [ swap \ ] prettyprint-sequence
|
\ [ swap \ ] prettyprint-sequence
|
||||||
] check-recursion ;
|
] check-recursion
|
||||||
|
] [
|
||||||
|
f unparse write
|
||||||
|
] ifte* ;
|
||||||
|
|
||||||
M: cons prettyprint* ( indent cons -- indent )
|
M: cons prettyprint* ( indent cons -- indent )
|
||||||
#! Here we turn the cons into a list of two elements.
|
#! Here we turn the cons into a list of two elements.
|
||||||
|
|
Loading…
Reference in New Issue