-
-
Notifications
You must be signed in to change notification settings - Fork 7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Base implementation of autocomplete #849
- Loading branch information
1 parent
9887198
commit b679e3b
Showing
10 changed files
with
214 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
package cc.arduino.autocomplete; | ||
|
||
import org.fife.ui.autocomplete.CompletionProvider; | ||
|
||
import processing.app.Sketch; | ||
import processing.app.syntax.SketchTextArea; | ||
|
||
public class CompletionContext { | ||
|
||
private Sketch sketch; | ||
|
||
private SketchTextArea textArea; | ||
|
||
private CompletionProvider delegate; // of: AutoComplete/RSyntaxTextArea | ||
|
||
public CompletionContext(Sketch sketch, SketchTextArea textArea,CompletionProvider delegate) { | ||
this.sketch = sketch; | ||
this.textArea = textArea; | ||
this.delegate = delegate; | ||
} | ||
|
||
|
||
public String getAlreadyEnteredText() { | ||
return delegate.getAlreadyEnteredText(textArea); | ||
} | ||
|
||
public int getLineNumber() { | ||
return textArea.getCaretLineNumber(); | ||
} | ||
|
||
|
||
public Sketch getSketch() { | ||
return sketch; | ||
} | ||
|
||
public SketchTextArea getTextArea() { | ||
return textArea; | ||
} | ||
|
||
public CompletionProvider getDelegate() { | ||
return delegate; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
package cc.arduino.autocomplete; | ||
|
||
import java.util.List; | ||
|
||
import org.fife.ui.autocomplete.Completion; | ||
|
||
public interface CompletionProvider { | ||
|
||
List<Completion> getSuggestions(CompletionContext context); | ||
|
||
} |
22 changes: 22 additions & 0 deletions
22
app/src/cc/arduino/autocomplete/FakeCompletionProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package cc.arduino.autocomplete; | ||
|
||
import java.util.LinkedList; | ||
import java.util.List; | ||
|
||
import org.fife.ui.autocomplete.BasicCompletion; | ||
import org.fife.ui.autocomplete.Completion; | ||
|
||
public class FakeCompletionProvider implements CompletionProvider { | ||
|
||
|
||
@Override | ||
public List<Completion> getSuggestions(CompletionContext context) { | ||
List<Completion> list = new LinkedList<>(); | ||
list.add(new BasicCompletion(context.getDelegate(), "Text: " + context.getAlreadyEnteredText())); | ||
list.add(new BasicCompletion(context.getDelegate(), "Line: " + context.getLineNumber())); | ||
|
||
return list; | ||
} | ||
|
||
|
||
} |
36 changes: 36 additions & 0 deletions
36
app/src/cc/arduino/autocomplete/rsyntax/CompletionProviderBridge.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package cc.arduino.autocomplete.rsyntax; | ||
|
||
import java.util.List; | ||
|
||
import javax.swing.text.JTextComponent; | ||
|
||
import org.fife.ui.autocomplete.Completion; | ||
import org.fife.ui.autocomplete.DefaultCompletionProvider; | ||
|
||
import cc.arduino.autocomplete.CompletionContext; | ||
import cc.arduino.autocomplete.CompletionProvider; | ||
|
||
public class CompletionProviderBridge extends DefaultCompletionProvider{ | ||
|
||
private CompletionProvider provider; | ||
|
||
private CompletionContext context; | ||
|
||
public CompletionProviderBridge(CompletionContext context, CompletionProvider provider) { | ||
this.provider = provider; | ||
this.context = context; | ||
} | ||
|
||
|
||
@Override | ||
public List<Completion> getCompletionsImpl(JTextComponent comp) { | ||
return provider.getSuggestions(context); | ||
|
||
} | ||
|
||
@Override | ||
protected boolean isValidChar(char ch) { | ||
return super.isValidChar(ch) || '.' == ch || '>' == ch || '-' == ch || '<' == ch || '#' == ch || ':' == ch /**|| getParameterListStart() == ch */; | ||
} | ||
|
||
} |
33 changes: 33 additions & 0 deletions
33
app/src/cc/arduino/autocomplete/rsyntax/SketchCompletionProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package cc.arduino.autocomplete.rsyntax; | ||
|
||
import org.fife.ui.autocomplete.LanguageAwareCompletionProvider; | ||
|
||
import cc.arduino.autocomplete.CompletionContext; | ||
import cc.arduino.autocomplete.CompletionProvider; | ||
import processing.app.Sketch; | ||
import processing.app.syntax.SketchTextArea; | ||
|
||
|
||
/** | ||
* CompletionProvider for Arduino/CPP Language. <br/> | ||
* Setup basic logic for completions using {@link LanguageAwareCompletionProvider} | ||
* Filtering and decision will appear in the autocomplete dialog by implementations of: {@link CompletionProvider}. <br/> | ||
* | ||
* @author Ricardo JL Rufino (ricardo@criativasoft.com.br) | ||
* @date 28/04/2017 | ||
*/ | ||
public class SketchCompletionProvider extends LanguageAwareCompletionProvider{ | ||
|
||
public SketchCompletionProvider(Sketch sketch, SketchTextArea textArea, CompletionProvider provider) { | ||
|
||
CompletionContext context = new CompletionContext(sketch, textArea, this); | ||
|
||
setDefaultCompletionProvider(new CompletionProviderBridge(context, provider)); | ||
// provider.setParameterChoicesProvider(new ParameterChoicesProvider(this)); | ||
// provider.setParameterizedCompletionParams('(', ", ", ')'); | ||
|
||
} | ||
|
||
|
||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters