Base implementation of autocomplete #849 #6235
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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); | ||
|
|
||
| } |
This file contains hidden or 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; | ||
| } | ||
|
|
||
|
|
||
| } |
This file contains hidden or 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{ | ||
|
There was a problem hiding this comment. So, it seems that rsyntaxtextarea's autocomplete.jar already has a CompletionProvider, I didn't know that, having a |
||
|
|
||
| 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 */; | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or 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 ([email protected]) | ||
| * @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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this the autocomplete library here?
https://github.com/bobbylight/AutoComplete
where did you found the jar?
I think that the launchers for Windows must be updated too:
build/windows/launcher/config.xml
build/windows/launcher/config_debug.xml