diff --git a/src/main/java/com/zhongan/devpilot/actions/changesview/GenerateGitCommitMessageAction.java b/src/main/java/com/zhongan/devpilot/actions/changesview/GenerateGitCommitMessageAction.java index 05b8af5a..1e8783b3 100644 --- a/src/main/java/com/zhongan/devpilot/actions/changesview/GenerateGitCommitMessageAction.java +++ b/src/main/java/com/zhongan/devpilot/actions/changesview/GenerateGitCommitMessageAction.java @@ -24,14 +24,11 @@ import com.intellij.vcs.commit.AbstractCommitWorkflowHandler; import com.zhongan.devpilot.DevPilotIcons; import com.zhongan.devpilot.actions.notifications.DevPilotNotification; -import com.zhongan.devpilot.constant.DefaultConst; -import com.zhongan.devpilot.constant.PromptConst; import com.zhongan.devpilot.integrations.llms.LlmProviderFactory; import com.zhongan.devpilot.integrations.llms.entity.DevPilotChatCompletionRequest; import com.zhongan.devpilot.integrations.llms.entity.DevPilotChatCompletionResponse; import com.zhongan.devpilot.settings.state.LanguageSettingsState; import com.zhongan.devpilot.util.DevPilotMessageBundle; -import com.zhongan.devpilot.util.DocumentUtil; import com.zhongan.devpilot.util.MessageUtil; import java.io.StringWriter; @@ -42,7 +39,7 @@ import java.util.Locale; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import git4idea.repo.GitRepository; @@ -82,11 +79,11 @@ public void actionPerformed(@NotNull AnActionEvent e) { var editor = commitMessage != null ? commitMessage.getEditorField().getEditor() : null; ApplicationManager.getApplication().invokeLater(() -> ApplicationManager.getApplication().runWriteAction(() -> - WriteCommandAction.runWriteCommandAction(project, () -> { - if (editor != null) { - editor.getDocument().setText(" "); - } - }))); + WriteCommandAction.runWriteCommandAction(project, () -> { + if (editor != null) { + editor.getDocument().setText(" "); + } + }))); generateCommitMessage(project, diff, editor); } catch (Exception ex) { DevPilotNotification.warn("Exception occurred while generating commit message"); @@ -94,9 +91,6 @@ public void actionPerformed(@NotNull AnActionEvent e) { } private void generateCommitMessage(Project project, String diff, Editor editor) { - if (DocumentUtil.experienceEstimatedTokens(diff) + DocumentUtil.experienceEstimatedTokens(PromptConst.GENERATE_COMMIT) > DefaultConst.GPT_35_TOKEN_MAX_LENGTH) { - DevPilotNotification.warn(DevPilotMessageBundle.get("devpilot.changesview.tokens.estimation.overflow")); - } new Task.Backgroundable(project, DevPilotMessageBundle.get("devpilot.commit.tip"), true) { @Override public void run(@NotNull ProgressIndicator progressIndicator) { @@ -187,4 +181,5 @@ public static String getLocale() { Locale locale = languageIndex == 0 ? Locale.ENGLISH : Locale.SIMPLIFIED_CHINESE; return locale.getDisplayLanguage(); } + }