Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Completion display fix. #93

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Completion display fix. #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d37661b
Completion display fix.
maozhen520 Oct 11, 2024
4710510
Method shortcut display.
maozhen520 Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/zhongan/devpilot/completions/inline/CompletionPreview.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private CompletionPreview(
devPilotInlay = DevPilotInlay.create(this);
}

public static DevPilotCompletion createInstance(
public static synchronized DevPilotCompletion createInstance(
Editor editor, List<DevPilotCompletion> completions, int offset) {
CompletionPreview preview = getInstance(editor);

Expand Down
17 changes: 10 additions & 7 deletions src/main/java/com/zhongan/devpilot/completions/inline/CompletionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.util.TextRange;
import com.intellij.util.ui.EdtInvocationManager;
import com.zhongan.devpilot.completions.prediction.DevPilotCompletion;
import com.zhongan.devpilot.util.CommentUtil;

Expand Down Expand Up @@ -174,13 +175,15 @@ private static void buildDelayTrigger(@NotNull Editor editor,
new TimerTask() {
@Override
public void run() {
singletonOfInlineCompletionHandler().retrieveAndShowCompletion(
editor,
offset,
lastShownSuggestion,
userInput,
completionAdjustment,
completionType);
EdtInvocationManager.invokeAndWaitIfNeeded(
() ->
singletonOfInlineCompletionHandler().retrieveAndShowCompletion(
editor,
offset,
lastShownSuggestion,
userInput,
completionAdjustment,
completionType));
}
}, getTriggerInterval());
lastTriggerInfo.setTimer(timer);
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/messages/devpilot_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ devpilot.notification.upgrade.message=Go to upgrade devpilot

devpilot.settings.methodShortcutDisplayModeLabel=Method Shortcut Display Mode
devpilot.settings.methodShortcutHidden=Hidden
devpilot.settings.methodShortcutInlineDisplay=Inline Display
devpilot.settings.methodShortcutGroupDisplay=Group Display
devpilot.settings.methodShortcutInlineDisplay=Inline
devpilot.settings.methodShortcutGroupDisplay=Group
Loading