diff --git a/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationComponent.java b/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationComponent.java index 5e6d7958..2b4e188b 100644 --- a/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationComponent.java +++ b/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationComponent.java @@ -48,10 +48,8 @@ public class ConfigurationComponent { private final JBCheckBox autoFormattingCheckBox; private final JTextArea systemPromptTextArea; private final JTextArea commitMessagePromptTextArea; - private final JTextArea inlineCompletionPromptTextArea; private final IntegerField maxTokensField; private final JBTextField temperatureField; - private final JBTextField inlineDelayField; public ConfigurationComponent(Disposable parentDisposable, ConfigurationState configuration) { table = new JBTable(new DefaultTableModel( @@ -109,33 +107,6 @@ public class ConfigurationComponent { commitMessagePromptTextArea.setLineWrap(true); commitMessagePromptTextArea.setBorder(JBUI.Borders.empty(8, 4)); - inlineCompletionPromptTextArea = new JTextArea(configuration.getInlineCompletionPrompt(), 3, - 60); - inlineCompletionPromptTextArea.setLineWrap(true); - inlineCompletionPromptTextArea.setBorder(JBUI.Borders.empty(8, 4)); - - inlineDelayField = new JBTextField(12); - inlineDelayField.setText(String.valueOf(configuration.getTemperature())); - - var inlineDelayFieldValidator = createInlineDelayInputValidator(parentDisposable, - inlineDelayField); - inlineDelayField.getDocument().addDocumentListener(new DocumentListener() { - @Override - public void insertUpdate(DocumentEvent e) { - inlineDelayFieldValidator.revalidate(); - } - - @Override - public void removeUpdate(DocumentEvent e) { - inlineDelayFieldValidator.revalidate(); - } - - @Override - public void changedUpdate(DocumentEvent e) { - inlineDelayFieldValidator.revalidate(); - } - }); - checkForPluginUpdatesCheckBox = new JBCheckBox( CodeGPTBundle.get("configurationConfigurable.checkForPluginUpdates.label"), configuration.isCheckForPluginUpdates()); @@ -160,15 +131,10 @@ public class ConfigurationComponent { .addComponent(new TitledSeparator( CodeGPTBundle.get("configurationConfigurable.section.assistant.title"))) .addComponent(createAssistantConfigurationForm()) - .addComponentFillVertically(new JPanel(), 0) .addComponent(new TitledSeparator( CodeGPTBundle.get("configurationConfigurable.section.commitMessage.title"))) .addComponent(createCommitMessageConfigurationForm()) .addComponentFillVertically(new JPanel(), 0) - .addComponent(new TitledSeparator( - CodeGPTBundle.get("configurationConfigurable.section.inlineCompletion.title"))) - .addComponent(createInlineCompletionConfigurationForm()) - .addComponentFillVertically(new JPanel(), 0) .getPanel(); } @@ -261,27 +227,6 @@ public class ConfigurationComponent { return form; } - private JPanel createInlineCompletionConfigurationForm() { - var formBuilder = FormBuilder.createFormBuilder(); - addAssistantFormLabeledComponent( - formBuilder, - "configurationConfigurable.section.inlineCompletion.systemPromptField.label", - "configurationConfigurable.section.inlineCompletion.systemPromptField.comment", - JBUI.Panels - .simplePanel(inlineCompletionPromptTextArea) - .withBorder(JBUI.Borders.customLine( - JBUI.CurrentTheme.CustomFrameDecorations.separatorForeground()))); - formBuilder.addVerticalGap(8); - addAssistantFormLabeledComponent( - formBuilder, - "configurationConfigurable.section.inlineCompletion.delay.label", - "configurationConfigurable.section.inlineCompletion.delay.comment", - inlineDelayField); - var form = formBuilder.getPanel(); - form.setBorder(JBUI.Borders.emptyLeft(16)); - return form; - } - private ComponentValidator createTemperatureInputValidator( Disposable parentDisposable, JBTextField component) { @@ -309,33 +254,6 @@ public class ConfigurationComponent { return validator; } - private ComponentValidator createInlineDelayInputValidator( - Disposable parentDisposable, - JBTextField component) { - var validator = new ComponentValidator(parentDisposable) - .withValidator(() -> { - var valueText = component.getText(); - try { - var value = Integer.parseInt(valueText); - if (value <= 0) { - return new ValidationInfo( - CodeGPTBundle.get("validation.error.mustBeGreaterThanZero"), - component); - } - } catch (NumberFormatException e) { - return new ValidationInfo( - CodeGPTBundle.get("validation.error.mustBeNumber"), - component); - } - - return null; - }) - .andStartOnFocusLost() - .installOn(component); - validator.enableValidation(); - return validator; - } - private DefaultTableModel getModel() { return (DefaultTableModel) table.getModel(); } @@ -362,23 +280,6 @@ public class ConfigurationComponent { return commitMessagePromptTextArea.getText(); } - public void setInlineCompletionPrompt(String inlineCompletionPrompt) { - inlineCompletionPromptTextArea.setText(inlineCompletionPrompt); - } - - public String getInlineCompletionPrompt() { - return inlineCompletionPromptTextArea.getText(); - } - - - public int getInlineDelay() { - return Integer.parseInt(inlineDelayField.getText()); - } - - public void setInlineDelay(int inlineDelay) { - inlineDelayField.setText(String.valueOf(inlineDelay)); - } - public double getTemperature() { return Double.parseDouble(temperatureField.getText()); } diff --git a/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationConfigurable.java b/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationConfigurable.java index a225f578..baa62886 100644 --- a/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationConfigurable.java +++ b/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationConfigurable.java @@ -36,12 +36,9 @@ public class ConfigurationConfigurable implements Configurable { return !configurationComponent.getTableData().equals(configuration.getTableData()) || configurationComponent.getMaxTokens() != configuration.getMaxTokens() || configurationComponent.getTemperature() != configuration.getTemperature() - || configurationComponent.getInlineDelay() != configuration.getInlineDelay() || !configurationComponent.getSystemPrompt().equals(configuration.getSystemPrompt()) || !configurationComponent.getCommitMessagePrompt() .equals(configuration.getCommitMessagePrompt()) - || !configurationComponent.getInlineCompletionPrompt() - .equals(configuration.getInlineCompletionPrompt()) || configurationComponent.isCheckForPluginUpdates() != configuration.isCheckForPluginUpdates() || configurationComponent.isCreateNewChatOnEachAction() @@ -60,8 +57,6 @@ public class ConfigurationConfigurable implements Configurable { configuration.setTemperature(configurationComponent.getTemperature()); configuration.setSystemPrompt(configurationComponent.getSystemPrompt()); configuration.setCommitMessagePrompt(configurationComponent.getCommitMessagePrompt()); - configuration.setInlineCompletionPrompt(configurationComponent.getInlineCompletionPrompt()); - configuration.setInlineDelay(configurationComponent.getInlineDelay()); configuration.setCheckForPluginUpdates(configurationComponent.isCheckForPluginUpdates()); configuration.setCreateNewChatOnEachAction( configurationComponent.isCreateNewChatOnEachAction()); @@ -79,8 +74,6 @@ public class ConfigurationConfigurable implements Configurable { configurationComponent.setTemperature(configuration.getTemperature()); configurationComponent.setSystemPrompt(configuration.getSystemPrompt()); configurationComponent.setCommitMessagePrompt(configuration.getCommitMessagePrompt()); - configurationComponent.setInlineCompletionPrompt(configuration.getInlineCompletionPrompt()); - configurationComponent.setInlineDelay(configuration.getInlineDelay()); configurationComponent.setCheckForPluginUpdates(configuration.isCheckForPluginUpdates()); configurationComponent.setCreateNewChatOnEachAction( configuration.isCreateNewChatOnEachAction()); diff --git a/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationState.java b/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationState.java index 6c10f548..c627b45d 100644 --- a/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationState.java +++ b/src/main/java/ee/carlrobert/codegpt/settings/configuration/ConfigurationState.java @@ -2,7 +2,6 @@ package ee.carlrobert.codegpt.settings.configuration; import static ee.carlrobert.codegpt.completions.CompletionRequestProvider.COMPLETION_SYSTEM_PROMPT; import static ee.carlrobert.codegpt.completions.CompletionRequestProvider.GENERATE_COMMIT_MESSAGE_SYSTEM_PROMPT; -import static ee.carlrobert.codegpt.completions.CompletionRequestProvider.INLINE_COMPLETION_PROMPT; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.PersistentStateComponent; @@ -21,10 +20,8 @@ public class ConfigurationState implements PersistentStateComponent