diff --git a/comparing_string_references_inspection/src/main/java/org/intellij/sdk/codeInspection/ComparingStringReferencesInspection.java b/comparing_string_references_inspection/src/main/java/org/intellij/sdk/codeInspection/ComparingStringReferencesInspection.java index ca6b88439..045e928b4 100644 --- a/comparing_string_references_inspection/src/main/java/org/intellij/sdk/codeInspection/ComparingStringReferencesInspection.java +++ b/comparing_string_references_inspection/src/main/java/org/intellij/sdk/codeInspection/ComparingStringReferencesInspection.java @@ -58,8 +58,8 @@ public void visitBinaryExpression(@NotNull PsiBinaryExpression expression) { if (isStringType(lOperand) || isStringType(rOperand)) { // Identified an expression with potential problems, register problem with the quick fix object holder.registerProblem(expression, - InspectionBundle.message("inspection.comparing.string.references.problem.descriptor"), - myQuickFix); + InspectionBundle.message("inspection.comparing.string.references.problem.descriptor"), + myQuickFix); } } } @@ -75,7 +75,7 @@ private boolean isStringType(PsiExpression operand) { private static boolean isNullLiteral(PsiExpression expression) { return expression instanceof PsiLiteralExpression && - ((PsiLiteralExpression) expression).getValue() == null; + ((PsiLiteralExpression) expression).getValue() == null; } }; } @@ -115,7 +115,7 @@ public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descri PsiElementFactory factory = JavaPsiFacade.getInstance(project).getElementFactory(); PsiMethodCallExpression equalsCall = - (PsiMethodCallExpression) factory.createExpressionFromText("a.equals(b)", null); + (PsiMethodCallExpression) factory.createExpressionFromText("a.equals(b)", null); PsiExpression qualifierExpression = equalsCall.getMethodExpression().getQualifierExpression(); assert qualifierExpression != null; diff --git a/comparing_string_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingStringReferencesInspectionTest.java b/comparing_string_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingStringReferencesInspectionTest.java index d77cd8a9d..c2c4b45a2 100644 --- a/comparing_string_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingStringReferencesInspectionTest.java +++ b/comparing_string_references_inspection/src/test/java/org/intellij/sdk/codeInspection/ComparingStringReferencesInspectionTest.java @@ -14,7 +14,7 @@ public class ComparingStringReferencesInspectionTest extends LightJavaCodeInsightFixtureTestCase { private static final String QUICK_FIX_NAME = - InspectionBundle.message("inspection.comparing.string.references.use.quickfix"); + InspectionBundle.message("inspection.comparing.string.references.use.quickfix"); @Override protected void setUp() throws Exception { diff --git a/editor_basics/src/main/java/org/intellij/sdk/editor/EditorAreaIllustration.java b/editor_basics/src/main/java/org/intellij/sdk/editor/EditorAreaIllustration.java index ef935df9e..e04235148 100644 --- a/editor_basics/src/main/java/org/intellij/sdk/editor/EditorAreaIllustration.java +++ b/editor_basics/src/main/java/org/intellij/sdk/editor/EditorAreaIllustration.java @@ -41,7 +41,7 @@ public void actionPerformed(@NotNull final AnActionEvent e) { int caretOffset = primaryCaret.getOffset(); // Build and display the caret report. String report = logicalPos + "\n" + visualPos + "\n" + - "Offset: " + caretOffset; + "Offset: " + caretOffset; Messages.showInfoMessage(report, "Caret Parameters Inside The Editor"); } diff --git a/editor_basics/src/main/java/org/intellij/sdk/editor/EditorHandlerIllustration.java b/editor_basics/src/main/java/org/intellij/sdk/editor/EditorHandlerIllustration.java index e658612fc..8ed545109 100644 --- a/editor_basics/src/main/java/org/intellij/sdk/editor/EditorHandlerIllustration.java +++ b/editor_basics/src/main/java/org/intellij/sdk/editor/EditorHandlerIllustration.java @@ -34,7 +34,7 @@ public void actionPerformed(@NotNull final AnActionEvent e) { final EditorActionManager actionManager = EditorActionManager.getInstance(); // Get the action handler registered to clone carets final EditorActionHandler actionHandler = - actionManager.getActionHandler(IdeActions.ACTION_EDITOR_CLONE_CARET_BELOW); + actionManager.getActionHandler(IdeActions.ACTION_EDITOR_CLONE_CARET_BELOW); // Clone one caret below the active caret actionHandler.execute(editor, editor.getCaretModel().getPrimaryCaret(), e.getDataContext()); } diff --git a/editor_basics/src/main/java/org/intellij/sdk/editor/EditorIllustrationAction.java b/editor_basics/src/main/java/org/intellij/sdk/editor/EditorIllustrationAction.java index 1d497ded6..3592bde71 100644 --- a/editor_basics/src/main/java/org/intellij/sdk/editor/EditorIllustrationAction.java +++ b/editor_basics/src/main/java/org/intellij/sdk/editor/EditorIllustrationAction.java @@ -44,7 +44,7 @@ public void actionPerformed(@NotNull final AnActionEvent e) { // Replace the selection with a fixed string. // Must do this document change in a write action context. WriteCommandAction.runWriteCommandAction(project, () -> - document.replaceString(start, end, "Replacement") + document.replaceString(start, end, "Replacement") ); // De-select the text range that was just replaced primaryCaret.removeSelection(); @@ -67,7 +67,7 @@ public void update(@NotNull final AnActionEvent e) { final Editor editor = e.getData(CommonDataKeys.EDITOR); // Set visibility and enable only in case of existing project and editor and if a selection exists e.getPresentation().setEnabledAndVisible( - project != null && editor != null && editor.getSelectionModel().hasSelection() + project != null && editor != null && editor.getSelectionModel().hasSelection() ); } diff --git a/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetConfiguration.java b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetConfiguration.java index 1feb4ae76..43d4d4fbe 100644 --- a/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetConfiguration.java +++ b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetConfiguration.java @@ -51,7 +51,7 @@ public void loadState(@NotNull DemoFacetState state) { @Override public FacetEditorTab[] createEditorTabs(FacetEditorContext context, FacetValidatorsManager manager) { return new FacetEditorTab[]{ - new DemoFacetEditorTab(myFacetState, context, manager) + new DemoFacetEditorTab(myFacetState, context, manager) }; } diff --git a/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java index 57f1952c2..b79acd5e5 100644 --- a/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java +++ b/facet_basics/src/main/java/org/intellij/sdk/facet/DemoFacetEditorTab.java @@ -18,6 +18,7 @@ * Manages validation and modification of the {@link DemoFacet} state. */ public class DemoFacetEditorTab extends FacetEditorTab { + private static final String FACET_PANEL_PROMPT = "Path To SDK: "; private final DemoFacetState mySettings; @@ -84,7 +85,7 @@ public void apply() throws ConfigurationException { try { String newTextContent = myPath.getText(); mySettings.setDemoFacetState(newTextContent); - } catch(Exception e) { + } catch (Exception e) { throw new ConfigurationException(e.toString()); } } diff --git a/max_opened_projects/src/main/java/org/intellij/sdk/maxOpenProjects/ProjectCloseListener.java b/max_opened_projects/src/main/java/org/intellij/sdk/maxOpenProjects/ProjectCloseListener.java index 8aef3961f..925ed621b 100644 --- a/max_opened_projects/src/main/java/org/intellij/sdk/maxOpenProjects/ProjectCloseListener.java +++ b/max_opened_projects/src/main/java/org/intellij/sdk/maxOpenProjects/ProjectCloseListener.java @@ -21,7 +21,7 @@ public void projectClosed(@NotNull Project project) { // Get the counting service ProjectCountingService projectCountingService = - ApplicationManager.getApplication().getService(ProjectCountingService.class); + ApplicationManager.getApplication().getService(ProjectCountingService.class); // Decrement the count because a project just closed projectCountingService.decreaseOpenProjectCount(); } diff --git a/max_opened_projects/src/main/java/org/intellij/sdk/maxOpenProjects/ProjectOpenStartupActivity.java b/max_opened_projects/src/main/java/org/intellij/sdk/maxOpenProjects/ProjectOpenStartupActivity.java index fa057c062..6a54ad9ea 100644 --- a/max_opened_projects/src/main/java/org/intellij/sdk/maxOpenProjects/ProjectOpenStartupActivity.java +++ b/max_opened_projects/src/main/java/org/intellij/sdk/maxOpenProjects/ProjectOpenStartupActivity.java @@ -22,7 +22,7 @@ public void runActivity(@NotNull Project project) { // Get the counting service ProjectCountingService projectCountingService = - ApplicationManager.getApplication().getService(ProjectCountingService.class); + ApplicationManager.getApplication().getService(ProjectCountingService.class); // Increment the project count projectCountingService.increaseOpenProjectCount(); @@ -33,7 +33,7 @@ public void runActivity(@NotNull Project project) { String message = "
The number of open projects exceeds the SDK plugin max_opened_projects limit.

"; ApplicationManager.getApplication().invokeLater(() -> - Messages.showMessageDialog(project, message, title, Messages.getInformationIcon()) + Messages.showMessageDialog(project, message, title, Messages.getInformationIcon()) ); } } diff --git a/product_specific/pycharm_basics/src/main/java/org/intellij/sdk/pycharm/PopupDialogAction.java b/product_specific/pycharm_basics/src/main/java/org/intellij/sdk/pycharm/PopupDialogAction.java index 0cbb541a2..5e48dac64 100644 --- a/product_specific/pycharm_basics/src/main/java/org/intellij/sdk/pycharm/PopupDialogAction.java +++ b/product_specific/pycharm_basics/src/main/java/org/intellij/sdk/pycharm/PopupDialogAction.java @@ -26,9 +26,9 @@ public class PopupDialogAction extends AnAction { public void actionPerformed(@NotNull AnActionEvent event) { Project project = event.getProject(); Messages.showMessageDialog(project, - "Popup dialog action", - "Greetings from PyCharm Basics Plugin", - Messages.getInformationIcon()); + "Popup dialog action", + "Greetings from PyCharm Basics Plugin", + Messages.getInformationIcon()); } /** diff --git a/project_model/src/main/java/org/intellij/sdk/project/model/LibrariesAction.java b/project_model/src/main/java/org/intellij/sdk/project/model/LibrariesAction.java index 8397848ce..d224f473a 100644 --- a/project_model/src/main/java/org/intellij/sdk/project/model/LibrariesAction.java +++ b/project_model/src/main/java/org/intellij/sdk/project/model/LibrariesAction.java @@ -84,7 +84,7 @@ public void actionPerformed(@NotNull AnActionEvent event) { fileAndLibs = "None"; } Messages.showInfoMessage("Libraries for file: " + fileAndLibs, - "Libraries Info"); + "Libraries Info"); } } diff --git a/project_model/src/main/java/org/intellij/sdk/project/model/ProjectFileIndexSampleAction.java b/project_model/src/main/java/org/intellij/sdk/project/model/ProjectFileIndexSampleAction.java index 7cd424d49..26b10be88 100644 --- a/project_model/src/main/java/org/intellij/sdk/project/model/ProjectFileIndexSampleAction.java +++ b/project_model/src/main/java/org/intellij/sdk/project/model/ProjectFileIndexSampleAction.java @@ -54,11 +54,11 @@ public void actionPerformed(@NotNull final AnActionEvent event) { boolean isInLibraryClasses = projectFileIndex.isInLibraryClasses(virtualFile); boolean isInLibrarySource = projectFileIndex.isInLibrarySource(virtualFile); Messages.showInfoMessage("Module: " + moduleName + "\n" + - "Module content root: " + moduleContentRoot + "\n" + - "Is library file: " + isLibraryFile + "\n" + - "Is in library classes: " + isInLibraryClasses + - ", Is in library source: " + isInLibrarySource, - "Main File Info for" + virtualFile.getName()); + "Module content root: " + moduleContentRoot + "\n" + + "Is library file: " + isLibraryFile + "\n" + + "Is in library classes: " + isInLibraryClasses + + ", Is in library source: " + isInLibrarySource, + "Main File Info for" + virtualFile.getName()); } } diff --git a/project_model/src/main/java/org/intellij/sdk/project/model/ShowSourceRootsActions.java b/project_model/src/main/java/org/intellij/sdk/project/model/ShowSourceRootsActions.java index d2f2c096b..6e717396f 100644 --- a/project_model/src/main/java/org/intellij/sdk/project/model/ShowSourceRootsActions.java +++ b/project_model/src/main/java/org/intellij/sdk/project/model/ShowSourceRootsActions.java @@ -32,8 +32,8 @@ public void actionPerformed(@NotNull final AnActionEvent event) { sourceRootsList.append(file.getUrl()).append("\n"); } Messages.showInfoMessage( - "Source roots for the " + projectName + " plugin:\n" + sourceRootsList.toString(), - "Project Properties" + "Source roots for the " + projectName + " plugin:\n" + sourceRootsList.toString(), + "Project Properties" ); } diff --git a/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java b/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java index 28729a3a2..3dc230416 100644 --- a/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java +++ b/project_view_pane/src/main/java/org/intellij/sdk/view/pane/ImagesProjectNode.java @@ -113,9 +113,9 @@ public void run() { getImagesFiles(project).clear(); scanImages(project); ApplicationManager.getApplication().invokeLater(() -> - ProjectView.getInstance(project) - .getProjectViewPaneById(ImagesProjectViewPane.ID) - .updateFromRoot(true), + ProjectView.getInstance(project) + .getProjectViewPaneById(ImagesProjectViewPane.ID) + .updateFromRoot(true), project.getDisposed() ); } diff --git a/psi_demo/src/main/java/org/intellij/sdk/psi/PsiNavigationDemoAction.java b/psi_demo/src/main/java/org/intellij/sdk/psi/PsiNavigationDemoAction.java index f27c0e419..6f184d3fc 100644 --- a/psi_demo/src/main/java/org/intellij/sdk/psi/PsiNavigationDemoAction.java +++ b/psi_demo/src/main/java/org/intellij/sdk/psi/PsiNavigationDemoAction.java @@ -34,15 +34,15 @@ public void actionPerformed(AnActionEvent anActionEvent) { if (element != null) { PsiMethod containingMethod = PsiTreeUtil.getParentOfType(element, PsiMethod.class); infoBuilder - .append("Containing method: ") - .append(containingMethod != null ? containingMethod.getName() : "none") - .append("\n"); + .append("Containing method: ") + .append(containingMethod != null ? containingMethod.getName() : "none") + .append("\n"); if (containingMethod != null) { PsiClass containingClass = containingMethod.getContainingClass(); infoBuilder - .append("Containing class: ") - .append(containingClass != null ? containingClass.getName() : "none") - .append("\n"); + .append("Containing class: ") + .append(containingClass != null ? containingClass.getName() : "none") + .append("\n"); infoBuilder.append("Local variables:\n"); containingMethod.accept(new JavaRecursiveElementVisitor() { diff --git a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoConfigurationFactory.java b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoConfigurationFactory.java index cf345d4d5..51aa02ffe 100644 --- a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoConfigurationFactory.java +++ b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoConfigurationFactory.java @@ -24,7 +24,7 @@ protected DemoConfigurationFactory(ConfigurationType type) { @NotNull @Override public RunConfiguration createTemplateConfiguration( - @NotNull Project project) { + @NotNull Project project) { return new DemoRunConfiguration(project, this, "Demo"); } diff --git a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfiguration.java b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfiguration.java index e9b608d08..e7a3878d4 100644 --- a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfiguration.java +++ b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfiguration.java @@ -51,9 +51,9 @@ public RunProfileState getState(@NotNull Executor executor, @Override protected ProcessHandler startProcess() throws ExecutionException { GeneralCommandLine commandLine = - new GeneralCommandLine(getOptions().getScriptName()); + new GeneralCommandLine(getOptions().getScriptName()); OSProcessHandler processHandler = ProcessHandlerFactory.getInstance() - .createColoredProcessHandler(commandLine); + .createColoredProcessHandler(commandLine); ProcessTerminatedListener.attach(processHandler); return processHandler; } diff --git a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationOptions.java b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationOptions.java index a08058daa..428f848f2 100644 --- a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationOptions.java +++ b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationOptions.java @@ -8,7 +8,7 @@ public class DemoRunConfigurationOptions extends RunConfigurationOptions { private final StoredProperty myScriptName = - string("").provideDelegate(this, "scriptName"); + string("").provideDelegate(this, "scriptName"); public String getScriptName() { return myScriptName.getValue(this); diff --git a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationType.java b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationType.java index 4db55fefe..e4c06b5c4 100644 --- a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationType.java +++ b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoRunConfigurationType.java @@ -11,7 +11,7 @@ public class DemoRunConfigurationType extends ConfigurationTypeBase { protected DemoRunConfigurationType() { super(ID, "Demo", "Demo run configuration type", - NotNullLazyValue.createValue(() -> AllIcons.Nodes.Console)); + NotNullLazyValue.createValue(() -> AllIcons.Nodes.Console)); addFactory(new DemoConfigurationFactory(this)); } diff --git a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoSettingsEditor.java b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoSettingsEditor.java index b02f8bbe3..bdd3f9c97 100644 --- a/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoSettingsEditor.java +++ b/run_configuration/src/main/java/org/jetbrains/sdk/runConfiguration/DemoSettingsEditor.java @@ -17,10 +17,10 @@ public class DemoSettingsEditor extends SettingsEditor { public DemoSettingsEditor() { scriptPathField = new TextFieldWithBrowseButton(); scriptPathField.addBrowseFolderListener("Select Script File", null, null, - FileChooserDescriptorFactory.createSingleFileDescriptor()); + FileChooserDescriptorFactory.createSingleFileDescriptor()); myPanel = FormBuilder.createFormBuilder() - .addLabeledComponent("Script file", scriptPathField) - .getPanel(); + .addLabeledComponent("Script file", scriptPathField) + .getPanel(); } @Override diff --git a/settings/src/main/java/org/intellij/sdk/settings/AppSettingsComponent.java b/settings/src/main/java/org/intellij/sdk/settings/AppSettingsComponent.java index be8c79f84..1de5e949c 100644 --- a/settings/src/main/java/org/intellij/sdk/settings/AppSettingsComponent.java +++ b/settings/src/main/java/org/intellij/sdk/settings/AppSettingsComponent.java @@ -21,10 +21,10 @@ public class AppSettingsComponent { public AppSettingsComponent() { myMainPanel = FormBuilder.createFormBuilder() - .addLabeledComponent(new JBLabel("Enter user name: "), myUserNameText, 1, false) - .addComponent(myIdeaUserStatus, 1) - .addComponentFillVertically(new JPanel(), 0) - .getPanel(); + .addLabeledComponent(new JBLabel("Enter user name: "), myUserNameText, 1, false) + .addComponent(myIdeaUserStatus, 1) + .addComponentFillVertically(new JPanel(), 0) + .getPanel(); } public JPanel getPanel() { diff --git a/settings/src/main/java/org/intellij/sdk/settings/AppSettingsState.java b/settings/src/main/java/org/intellij/sdk/settings/AppSettingsState.java index 584c575d4..d32eda189 100644 --- a/settings/src/main/java/org/intellij/sdk/settings/AppSettingsState.java +++ b/settings/src/main/java/org/intellij/sdk/settings/AppSettingsState.java @@ -16,8 +16,8 @@ * these persistent application settings are stored. */ @State( - name = "org.intellij.sdk.settings.AppSettingsState", - storages = @Storage("SdkSettingsPlugin.xml") + name = "org.intellij.sdk.settings.AppSettingsState", + storages = @Storage("SdkSettingsPlugin.xml") ) public class AppSettingsState implements PersistentStateComponent { diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleAnnotator.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleAnnotator.java index bda4e4485..845edd1e6 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleAnnotator.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleAnnotator.java @@ -43,9 +43,9 @@ public void annotate(@NotNull final PsiElement element, @NotNull AnnotationHolde // highlight "simple" prefix and ":" separator holder.newSilentAnnotation(HighlightSeverity.INFORMATION) - .range(prefixRange).textAttributes(DefaultLanguageHighlighterColors.KEYWORD).create(); + .range(prefixRange).textAttributes(DefaultLanguageHighlighterColors.KEYWORD).create(); holder.newSilentAnnotation(HighlightSeverity.INFORMATION) - .range(separatorRange).textAttributes(SimpleSyntaxHighlighter.SEPARATOR).create(); + .range(separatorRange).textAttributes(SimpleSyntaxHighlighter.SEPARATOR).create(); // Get the list of properties for given key @@ -53,15 +53,15 @@ public void annotate(@NotNull final PsiElement element, @NotNull AnnotationHolde List properties = SimpleUtil.findProperties(element.getProject(), key); if (properties.isEmpty()) { holder.newAnnotation(HighlightSeverity.ERROR, "Unresolved property") - .range(keyRange) - .highlightType(ProblemHighlightType.LIKE_UNKNOWN_SYMBOL) - // ** Tutorial step 19. - Add a quick fix for the string containing possible properties - .withFix(new SimpleCreatePropertyQuickFix(key)) - .create(); + .range(keyRange) + .highlightType(ProblemHighlightType.LIKE_UNKNOWN_SYMBOL) + // ** Tutorial step 19. - Add a quick fix for the string containing possible properties + .withFix(new SimpleCreatePropertyQuickFix(key)) + .create(); } else { // Found at least one property, force the text attributes to Simple syntax value character holder.newSilentAnnotation(HighlightSeverity.INFORMATION) - .range(keyRange).textAttributes(SimpleSyntaxHighlighter.VALUE).create(); + .range(keyRange).textAttributes(SimpleSyntaxHighlighter.VALUE).create(); } } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java index 43bf8f4aa..04fb79f0c 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleBlock.java @@ -29,7 +29,7 @@ protected List buildChildren() { while (child != null) { if (child.getElementType() != TokenType.WHITE_SPACE) { Block block = new SimpleBlock(child, Wrap.createWrap(WrapType.NONE, false), Alignment.createAlignment(), - spacingBuilder); + spacingBuilder); blocks.add(block); } child = child.getTreeNext(); diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java index 786480ecb..4b1604bec 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleChooseByNameContributor.java @@ -25,7 +25,7 @@ public void processNames(@NotNull Processor processor, @Nullable IdFilter filter) { Project project = Objects.requireNonNull(scope.getProject()); List propertyKeys = ContainerUtil.map( - SimpleUtil.findProperties(project), SimpleProperty::getKey); + SimpleUtil.findProperties(project), SimpleProperty::getKey); ContainerUtil.process(propertyKeys, processor); } @@ -34,8 +34,8 @@ public void processElementsWithName(@NotNull String name, @NotNull Processor processor, @NotNull FindSymbolParameters parameters) { List properties = ContainerUtil.map( - SimpleUtil.findProperties(parameters.getProject(), name), - property -> (NavigationItem) property); + SimpleUtil.findProperties(parameters.getProject(), name), + property -> (NavigationItem) property); ContainerUtil.process(properties, processor); } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleColorSettingsPage.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleColorSettingsPage.java index 2ef858243..0d7c0e1c0 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleColorSettingsPage.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleColorSettingsPage.java @@ -16,10 +16,10 @@ public class SimpleColorSettingsPage implements ColorSettingsPage { private static final AttributesDescriptor[] DESCRIPTORS = new AttributesDescriptor[]{ - new AttributesDescriptor("Key", SimpleSyntaxHighlighter.KEY), - new AttributesDescriptor("Separator", SimpleSyntaxHighlighter.SEPARATOR), - new AttributesDescriptor("Value", SimpleSyntaxHighlighter.VALUE), - new AttributesDescriptor("Bad value", SimpleSyntaxHighlighter.BAD_CHARACTER) + new AttributesDescriptor("Key", SimpleSyntaxHighlighter.KEY), + new AttributesDescriptor("Separator", SimpleSyntaxHighlighter.SEPARATOR), + new AttributesDescriptor("Value", SimpleSyntaxHighlighter.VALUE), + new AttributesDescriptor("Bad value", SimpleSyntaxHighlighter.BAD_CHARACTER) }; @Nullable @@ -38,17 +38,17 @@ public SyntaxHighlighter getHighlighter() { @Override public String getDemoText() { return "# You are reading the \".properties\" entry.\n" + - "! The exclamation mark can also mark text as comments.\n" + - "website = https://en.wikipedia.org/\n" + - "language = English\n" + - "# The backslash below tells the application to continue reading\n" + - "# the value onto the next line.\n" + - "message = Welcome to \\\n" + - " Wikipedia!\n" + - "# Add spaces to the key\n" + - "key\\ with\\ spaces = This is the value that could be looked up with the key \"key with spaces\".\n" + - "# Unicode\n" + - "tab : \\u0009"; + "! The exclamation mark can also mark text as comments.\n" + + "website = https://en.wikipedia.org/\n" + + "language = English\n" + + "# The backslash below tells the application to continue reading\n" + + "# the value onto the next line.\n" + + "message = Welcome to \\\n" + + " Wikipedia!\n" + + "# Add spaces to the key\n" + + "key\\ with\\ spaces = This is the value that could be looked up with the key \"key with spaces\".\n" + + "# Unicode\n" + + "tab : \\u0009"; } @Nullable diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java index 3b261bd97..3d8121606 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCompletionContributor.java @@ -13,13 +13,13 @@ public class SimpleCompletionContributor extends CompletionContributor { public SimpleCompletionContributor() { extend(CompletionType.BASIC, PlatformPatterns.psiElement(SimpleTypes.VALUE), - new CompletionProvider<>() { - public void addCompletions(@NotNull CompletionParameters parameters, - @NotNull ProcessingContext context, - @NotNull CompletionResultSet resultSet) { - resultSet.addElement(LookupElementBuilder.create("Hello")); - } - } + new CompletionProvider<>() { + public void addCompletions(@NotNull CompletionParameters parameters, + @NotNull ProcessingContext context, + @NotNull CompletionResultSet resultSet) { + resultSet.addElement(LookupElementBuilder.create("Hello")); + } + } ); } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCreatePropertyQuickFix.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCreatePropertyQuickFix.java index d09143b57..bd8ba8b01 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCreatePropertyQuickFix.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleCreatePropertyQuickFix.java @@ -54,15 +54,15 @@ public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file @Override public void invoke(@NotNull final Project project, final Editor editor, PsiFile file) throws - IncorrectOperationException { + IncorrectOperationException { ApplicationManager.getApplication().invokeLater(() -> { Collection virtualFiles = - FileTypeIndex.getFiles(SimpleFileType.INSTANCE, GlobalSearchScope.allScope(project)); + FileTypeIndex.getFiles(SimpleFileType.INSTANCE, GlobalSearchScope.allScope(project)); if (virtualFiles.size() == 1) { createProperty(project, virtualFiles.iterator().next()); } else { final FileChooserDescriptor descriptor = - FileChooserDescriptorFactory.createSingleFileDescriptor(SimpleFileType.INSTANCE); + FileChooserDescriptorFactory.createSingleFileDescriptor(SimpleFileType.INSTANCE); descriptor.setRoots(ProjectUtil.guessProjectDir(project)); final VirtualFile file1 = FileChooser.chooseFile(descriptor, project, null); if (file1 != null) { diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java index b56f2cc09..0d69be9c9 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFindUsagesProvider.java @@ -19,9 +19,9 @@ public class SimpleFindUsagesProvider implements FindUsagesProvider { @Override public WordsScanner getWordsScanner() { return new DefaultWordsScanner(new SimpleLexerAdapter(), - SimpleTokenSets.IDENTIFIERS, - SimpleTokenSets.COMMENTS, - TokenSet.EMPTY); + SimpleTokenSets.IDENTIFIERS, + SimpleTokenSets.COMMENTS, + TokenSet.EMPTY); } @Override @@ -58,8 +58,8 @@ public String getDescriptiveName(@NotNull PsiElement element) { public String getNodeText(@NotNull PsiElement element, boolean useFullName) { if (element instanceof SimpleProperty) { return ((SimpleProperty) element).getKey() + - SimpleAnnotator.SIMPLE_SEPARATOR_STR + - ((SimpleProperty) element).getValue(); + SimpleAnnotator.SIMPLE_SEPARATOR_STR + + ((SimpleProperty) element).getValue(); } return ""; } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java index 9e18d6aee..114117112 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFoldingBuilder.java @@ -43,16 +43,16 @@ public void visitLiteralExpression(@NotNull PsiLiteralExpression literalExpressi if (value != null && value.startsWith(SimpleAnnotator.SIMPLE_PREFIX_STR + SimpleAnnotator.SIMPLE_SEPARATOR_STR)) { Project project = literalExpression.getProject(); String key = value.substring( - SimpleAnnotator.SIMPLE_PREFIX_STR.length() + SimpleAnnotator.SIMPLE_SEPARATOR_STR.length() + SimpleAnnotator.SIMPLE_PREFIX_STR.length() + SimpleAnnotator.SIMPLE_SEPARATOR_STR.length() ); // find SimpleProperty for the given key in the project SimpleProperty simpleProperty = ContainerUtil.getOnlyItem(SimpleUtil.findProperties(project, key)); if (simpleProperty != null) { // Add a folding descriptor for the literal expression at this node. descriptors.add(new FoldingDescriptor(literalExpression.getNode(), - new TextRange(literalExpression.getTextRange().getStartOffset() + 1, - literalExpression.getTextRange().getEndOffset() - 1), - group, Collections.singleton(simpleProperty))); + new TextRange(literalExpression.getTextRange().getStartOffset() + 1, + literalExpression.getTextRange().getEndOffset() - 1), + group, Collections.singleton(simpleProperty))); } } } @@ -78,10 +78,10 @@ public String getPlaceholderText(@NotNull ASTNode node) { } String key = text.substring(SimpleAnnotator.SIMPLE_PREFIX_STR.length() + - SimpleAnnotator.SIMPLE_SEPARATOR_STR.length()); + SimpleAnnotator.SIMPLE_SEPARATOR_STR.length()); SimpleProperty simpleProperty = ContainerUtil.getOnlyItem( - SimpleUtil.findProperties(psiLiteralExpression.getProject(), key) + SimpleUtil.findProperties(psiLiteralExpression.getProject(), key) ); if (simpleProperty == null) { return StringUtil.THREE_DOTS; diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFormattingModelBuilder.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFormattingModelBuilder.java index fe4b2370f..9a1bdfb3c 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFormattingModelBuilder.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleFormattingModelBuilder.java @@ -11,22 +11,22 @@ public class SimpleFormattingModelBuilder implements FormattingModelBuilder { private static SpacingBuilder createSpaceBuilder(CodeStyleSettings settings) { return new SpacingBuilder(settings, SimpleLanguage.INSTANCE) - .around(SimpleTypes.SEPARATOR) - .spaceIf(settings.getCommonSettings(SimpleLanguage.INSTANCE.getID()).SPACE_AROUND_ASSIGNMENT_OPERATORS) - .before(SimpleTypes.PROPERTY) - .none(); + .around(SimpleTypes.SEPARATOR) + .spaceIf(settings.getCommonSettings(SimpleLanguage.INSTANCE.getID()).SPACE_AROUND_ASSIGNMENT_OPERATORS) + .before(SimpleTypes.PROPERTY) + .none(); } @Override public @NotNull FormattingModel createModel(@NotNull FormattingContext formattingContext) { final CodeStyleSettings codeStyleSettings = formattingContext.getCodeStyleSettings(); return FormattingModelProvider - .createFormattingModelForPsiFile(formattingContext.getContainingFile(), - new SimpleBlock(formattingContext.getNode(), - Wrap.createWrap(WrapType.NONE, false), - Alignment.createAlignment(), - createSpaceBuilder(codeStyleSettings)), - codeStyleSettings); + .createFormattingModelForPsiFile(formattingContext.getContainingFile(), + new SimpleBlock(formattingContext.getNode(), + Wrap.createWrap(WrapType.NONE, false), + Alignment.createAlignment(), + createSpaceBuilder(codeStyleSettings)), + codeStyleSettings); } } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java index 7add86e57..a336ffc69 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLanguageCodeStyleSettingsProvider.java @@ -28,18 +28,18 @@ public void customizeSettings(@NotNull CodeStyleSettingsCustomizable consumer, @ @Override public String getCodeSample(@NotNull SettingsType settingsType) { return "# You are reading the \".properties\" entry.\n" + - "! The exclamation mark can also mark text as comments.\n" + - "website = https://en.wikipedia.org/\n" + - "\n" + - "language = English\n" + - "# The backslash below tells the application to continue reading\n" + - "# the value onto the next line.\n" + - "message = Welcome to \\\n" + - " Wikipedia!\n" + - "# Add spaces to the key\n" + - "key\\ with\\ spaces = This is the value that could be looked up with the key \"key with spaces\".\n" + - "# Unicode\n" + - "tab : \\u0009"; + "! The exclamation mark can also mark text as comments.\n" + + "website = https://en.wikipedia.org/\n" + + "\n" + + "language = English\n" + + "# The backslash below tells the application to continue reading\n" + + "# the value onto the next line.\n" + + "message = Welcome to \\\n" + + " Wikipedia!\n" + + "# Add spaces to the key\n" + + "key\\ with\\ spaces = This is the value that could be looked up with the key \"key with spaces\".\n" + + "# Unicode\n" + + "tab : \\u0009"; } } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLineMarkerProvider.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLineMarkerProvider.java index 94aa4b9b7..4106934eb 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLineMarkerProvider.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleLineMarkerProvider.java @@ -29,22 +29,22 @@ protected void collectNavigationMarkers(@NotNull PsiElement element, PsiLiteralExpression literalExpression = (PsiLiteralExpression) element.getParent(); String value = literalExpression.getValue() instanceof String ? (String) literalExpression.getValue() : null; if ((value == null) || - !value.startsWith(SimpleAnnotator.SIMPLE_PREFIX_STR + SimpleAnnotator.SIMPLE_SEPARATOR_STR)) { + !value.startsWith(SimpleAnnotator.SIMPLE_PREFIX_STR + SimpleAnnotator.SIMPLE_SEPARATOR_STR)) { return; } // Get the Simple language property usage Project project = element.getProject(); String possibleProperties = value.substring( - SimpleAnnotator.SIMPLE_PREFIX_STR.length() + SimpleAnnotator.SIMPLE_SEPARATOR_STR.length() + SimpleAnnotator.SIMPLE_PREFIX_STR.length() + SimpleAnnotator.SIMPLE_SEPARATOR_STR.length() ); final List properties = SimpleUtil.findProperties(project, possibleProperties); if (properties.size() > 0) { // Add the property to a collection of line marker info NavigationGutterIconBuilder builder = - NavigationGutterIconBuilder.create(SimpleIcons.FILE) - .setTargets(properties) - .setTooltipText("Navigate to Simple language property"); + NavigationGutterIconBuilder.create(SimpleIcons.FILE) + .setTargets(properties) + .setTooltipText("Navigate to Simple language property"); result.add(builder.createLineMarkerInfo(element)); } } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java index b337eaa05..2285de8f0 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReference.java @@ -49,8 +49,8 @@ public PsiElement resolve() { for (final SimpleProperty property : properties) { if (property.getKey() != null && property.getKey().length() > 0) { variants.add(LookupElementBuilder - .create(property).withIcon(SimpleIcons.FILE) - .withTypeText(property.getContainingFile().getName()) + .create(property).withIcon(SimpleIcons.FILE) + .withTypeText(property.getContainingFile().getName()) ); } } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReferenceContributor.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReferenceContributor.java index 91b7af0cb..4d456b536 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReferenceContributor.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleReferenceContributor.java @@ -16,21 +16,21 @@ public class SimpleReferenceContributor extends PsiReferenceContributor { @Override public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar) { registrar.registerReferenceProvider(PlatformPatterns.psiElement(PsiLiteralExpression.class), - new PsiReferenceProvider() { - @Override - public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, - @NotNull ProcessingContext context) { - PsiLiteralExpression literalExpression = (PsiLiteralExpression) element; - String value = literalExpression.getValue() instanceof String ? - (String) literalExpression.getValue() : null; - if ((value != null && value.startsWith(SIMPLE_PREFIX_STR + SIMPLE_SEPARATOR_STR))) { - TextRange property = new TextRange(SIMPLE_PREFIX_STR.length() + SIMPLE_SEPARATOR_STR.length() + 1, - value.length() + 1); - return new PsiReference[]{new SimpleReference(element, property)}; - } - return PsiReference.EMPTY_ARRAY; - } - }); + new PsiReferenceProvider() { + @Override + public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, + @NotNull ProcessingContext context) { + PsiLiteralExpression literalExpression = (PsiLiteralExpression) element; + String value = literalExpression.getValue() instanceof String ? + (String) literalExpression.getValue() : null; + if ((value != null && value.startsWith(SIMPLE_PREFIX_STR + SIMPLE_SEPARATOR_STR))) { + TextRange property = new TextRange(SIMPLE_PREFIX_STR.length() + SIMPLE_SEPARATOR_STR.length() + 1, + value.length() + 1); + return new PsiReference[]{new SimpleReference(element, property)}; + } + return PsiReference.EMPTY_ARRAY; + } + }); } } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSpellcheckingStrategy.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSpellcheckingStrategy.java index 7520adfff..eff45dd6a 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSpellcheckingStrategy.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSpellcheckingStrategy.java @@ -18,63 +18,63 @@ public class SimpleSpellcheckingStrategy extends SpellcheckingStrategy { - @Override - public @NotNull Tokenizer getTokenizer(PsiElement element) { - if (element instanceof PsiComment) { - return new SimpleCommentTokenizer(); - } - - if (element instanceof SimpleProperty) { - return new SimplePropertyTokenizer(); - } + @Override + public @NotNull Tokenizer getTokenizer(PsiElement element) { + if (element instanceof PsiComment) { + return new SimpleCommentTokenizer(); + } - return EMPTY_TOKENIZER; + if (element instanceof SimpleProperty) { + return new SimplePropertyTokenizer(); } - private static class SimpleCommentTokenizer extends Tokenizer { + return EMPTY_TOKENIZER; + } - @Override - public void tokenize(@NotNull PsiComment element, TokenConsumer consumer) { - // Exclude the start of the comment with its # characters from spell checking - int startIndex = 0; - for (char c : element.textToCharArray()) { - if (c == '#' || Character.isWhitespace(c)) { - startIndex++; - } else { - break; - } - } - consumer.consumeToken(element, element.getText(), false, 0, - TextRange.create(startIndex, element.getTextLength()), - CommentSplitter.getInstance()); - } + private static class SimpleCommentTokenizer extends Tokenizer { + @Override + public void tokenize(@NotNull PsiComment element, TokenConsumer consumer) { + // Exclude the start of the comment with its # characters from spell checking + int startIndex = 0; + for (char c : element.textToCharArray()) { + if (c == '#' || Character.isWhitespace(c)) { + startIndex++; + } else { + break; + } + } + consumer.consumeToken(element, element.getText(), false, 0, + TextRange.create(startIndex, element.getTextLength()), + CommentSplitter.getInstance()); } - private static class SimplePropertyTokenizer extends Tokenizer { + } - public void tokenize(@NotNull SimpleProperty element, TokenConsumer consumer) { - //Spell check the keys and values of properties with different splitters - final ASTNode key = element.getNode().findChildByType(SimpleTypes.KEY); - if (key != null && key.getTextLength() > 0) { - final PsiElement keyPsi = key.getPsi(); - final String text = key.getText(); - //For keys, use a splitter for identifiers - //Note we set "useRename" to true so that keys will be properly refactored (renamed) - consumer.consumeToken(keyPsi, text, true, 0, - TextRange.allOf(text), IdentifierSplitter.getInstance()); - } + private static class SimplePropertyTokenizer extends Tokenizer { - final ASTNode value = element.getNode().findChildByType(SimpleTypes.VALUE); - if (value != null && value.getTextLength() > 0) { - final PsiElement valuePsi = value.getPsi(); - final String text = valuePsi.getText(); - //For values, use a splitter for plain text - consumer.consumeToken(valuePsi, text, false, 0, - TextRange.allOf(text), PlainTextSplitter.getInstance()); - } - } + public void tokenize(@NotNull SimpleProperty element, TokenConsumer consumer) { + //Spell check the keys and values of properties with different splitters + final ASTNode key = element.getNode().findChildByType(SimpleTypes.KEY); + if (key != null && key.getTextLength() > 0) { + final PsiElement keyPsi = key.getPsi(); + final String text = key.getText(); + //For keys, use a splitter for identifiers + //Note we set "useRename" to true so that keys will be properly refactored (renamed) + consumer.consumeToken(keyPsi, text, true, 0, + TextRange.allOf(text), IdentifierSplitter.getInstance()); + } + final ASTNode value = element.getNode().findChildByType(SimpleTypes.VALUE); + if (value != null && value.getTextLength() > 0) { + final PsiElement valuePsi = value.getPsi(); + final String text = valuePsi.getText(); + //For values, use a splitter for plain text + consumer.consumeToken(valuePsi, text, false, 0, + TextRange.allOf(text), PlainTextSplitter.getInstance()); + } } + } + } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureAwareNavbar.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureAwareNavbar.java index 12ae99e1f..08d22de14 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureAwareNavbar.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureAwareNavbar.java @@ -13,32 +13,33 @@ import javax.swing.Icon; public class SimpleStructureAwareNavbar extends StructureAwareNavBarModelExtension { - @NotNull - @Override - protected Language getLanguage() { - return SimpleLanguage.INSTANCE; - } - @Override - public @Nullable String getPresentableText(Object object) { - if (object instanceof SimpleFile) { - return ((SimpleFile) object).getName(); - } - if (object instanceof SimpleProperty) { - return ((SimpleProperty) object).getName(); - } + @NotNull + @Override + protected Language getLanguage() { + return SimpleLanguage.INSTANCE; + } - return null; + @Override + public @Nullable String getPresentableText(Object object) { + if (object instanceof SimpleFile) { + return ((SimpleFile) object).getName(); + } + if (object instanceof SimpleProperty) { + return ((SimpleProperty) object).getName(); } - @Override - @Nullable - public Icon getIcon(Object object) { - if (object instanceof SimpleProperty) { - return AllIcons.Nodes.Property; - } + return null; + } - return null; + @Override + @Nullable + public Icon getIcon(Object object) { + if (object instanceof SimpleProperty) { + return AllIcons.Nodes.Property; } + return null; + } + } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewModel.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewModel.java index 43cd3684e..87fc1434f 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewModel.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleStructureViewModel.java @@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable; public class SimpleStructureViewModel extends StructureViewModelBase implements - StructureViewModel.ElementInfoProvider { + StructureViewModel.ElementInfoProvider { public SimpleStructureViewModel(@Nullable Editor editor, PsiFile psiFile) { super(psiFile, editor, new SimpleStructureViewElement(psiFile)); @@ -39,4 +39,5 @@ public boolean isAlwaysLeaf(StructureViewTreeElement element) { protected Class @NotNull [] getSuitableClasses() { return new Class[]{SimpleProperty.class}; } + } diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSyntaxHighlighter.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSyntaxHighlighter.java index 1ca8c8002..c7d008479 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSyntaxHighlighter.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleSyntaxHighlighter.java @@ -17,15 +17,15 @@ public class SimpleSyntaxHighlighter extends SyntaxHighlighterBase { public static final TextAttributesKey SEPARATOR = - createTextAttributesKey("SIMPLE_SEPARATOR", DefaultLanguageHighlighterColors.OPERATION_SIGN); + createTextAttributesKey("SIMPLE_SEPARATOR", DefaultLanguageHighlighterColors.OPERATION_SIGN); public static final TextAttributesKey KEY = - createTextAttributesKey("SIMPLE_KEY", DefaultLanguageHighlighterColors.KEYWORD); + createTextAttributesKey("SIMPLE_KEY", DefaultLanguageHighlighterColors.KEYWORD); public static final TextAttributesKey VALUE = - createTextAttributesKey("SIMPLE_VALUE", DefaultLanguageHighlighterColors.STRING); + createTextAttributesKey("SIMPLE_VALUE", DefaultLanguageHighlighterColors.STRING); public static final TextAttributesKey COMMENT = - createTextAttributesKey("SIMPLE_COMMENT", DefaultLanguageHighlighterColors.LINE_COMMENT); + createTextAttributesKey("SIMPLE_COMMENT", DefaultLanguageHighlighterColors.LINE_COMMENT); public static final TextAttributesKey BAD_CHARACTER = - createTextAttributesKey("SIMPLE_BAD_CHARACTER", HighlighterColors.BAD_CHARACTER); + createTextAttributesKey("SIMPLE_BAD_CHARACTER", HighlighterColors.BAD_CHARACTER); private static final TextAttributesKey[] BAD_CHAR_KEYS = new TextAttributesKey[]{BAD_CHARACTER}; diff --git a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java index 91eb5f0a0..91e4d07a6 100644 --- a/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java +++ b/simple_language_plugin/src/main/java/org/intellij/sdk/language/SimpleUtil.java @@ -31,7 +31,7 @@ public class SimpleUtil { public static List findProperties(Project project, String key) { List result = new ArrayList<>(); Collection virtualFiles = - FileTypeIndex.getFiles(SimpleFileType.INSTANCE, GlobalSearchScope.allScope(project)); + FileTypeIndex.getFiles(SimpleFileType.INSTANCE, GlobalSearchScope.allScope(project)); for (VirtualFile virtualFile : virtualFiles) { SimpleFile simpleFile = (SimpleFile) PsiManager.getInstance(project).findFile(virtualFile); if (simpleFile != null) { @@ -51,7 +51,7 @@ public static List findProperties(Project project, String key) { public static List findProperties(Project project) { List result = new ArrayList<>(); Collection virtualFiles = - FileTypeIndex.getFiles(SimpleFileType.INSTANCE, GlobalSearchScope.allScope(project)); + FileTypeIndex.getFiles(SimpleFileType.INSTANCE, GlobalSearchScope.allScope(project)); for (VirtualFile virtualFile : virtualFiles) { SimpleFile simpleFile = (SimpleFile) PsiManager.getInstance(project).findFile(virtualFile); if (simpleFile != null) { @@ -77,7 +77,7 @@ public static List findProperties(Project project) { } element = element.getPrevSibling(); } - return StringUtil.join(Lists.reverse(result),"\n "); + return StringUtil.join(Lists.reverse(result), "\n "); } } diff --git a/simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleCodeInsightTest.java b/simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleCodeInsightTest.java index bb028124e..904451512 100644 --- a/simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleCodeInsightTest.java +++ b/simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleCodeInsightTest.java @@ -47,10 +47,10 @@ public void testFormatter() { CodeStyle.getLanguageSettings(myFixture.getFile()).SPACE_AROUND_ASSIGNMENT_OPERATORS = true; CodeStyle.getLanguageSettings(myFixture.getFile()).KEEP_BLANK_LINES_IN_CODE = 2; WriteCommandAction.writeCommandAction(getProject()).run(() -> - CodeStyleManager.getInstance(getProject()).reformatText( - myFixture.getFile(), - ContainerUtil.newArrayList(myFixture.getFile().getTextRange()) - ) + CodeStyleManager.getInstance(getProject()).reformatText( + myFixture.getFile(), + ContainerUtil.newArrayList(myFixture.getFile().getTextRange()) + ) ); myFixture.checkResultByFile("DefaultTestData.simple"); } @@ -82,7 +82,7 @@ public void testCommenter() { public void testReference() { PsiReference referenceAtCaret = - myFixture.getReferenceAtCaretPositionWithAssertion("ReferenceTestData.java", "DefaultTestData.simple"); + myFixture.getReferenceAtCaretPositionWithAssertion("ReferenceTestData.java", "DefaultTestData.simple"); final SimpleProperty resolvedSimpleProperty = assertInstanceOf(referenceAtCaret.resolve(), SimpleProperty.class); assertEquals("https://en.wikipedia.org/", resolvedSimpleProperty.getValue()); } diff --git a/simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleParsingTest.java b/simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleParsingTest.java index 60c52cdfc..91f56446f 100644 --- a/simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleParsingTest.java +++ b/simple_language_plugin/src/test/java/org/intellij/sdk/language/SimpleParsingTest.java @@ -13,7 +13,7 @@ public SimpleParsingTest() { public void testParsingTestData() { doTest(true); } - + /** * @return path to test data file directory relative to root of this module. */ diff --git a/tool_window/src/main/java/org/intellij/sdk/toolWindow/CalendarToolWindowFactory.java b/tool_window/src/main/java/org/intellij/sdk/toolWindow/CalendarToolWindowFactory.java index bbf448bdf..be3ed2917 100644 --- a/tool_window/src/main/java/org/intellij/sdk/toolWindow/CalendarToolWindowFactory.java +++ b/tool_window/src/main/java/org/intellij/sdk/toolWindow/CalendarToolWindowFactory.java @@ -80,8 +80,8 @@ private void updateCurrentDateTime() { private String getCurrentDate(Calendar calendar) { return calendar.get(Calendar.DAY_OF_MONTH) + "/" - + (calendar.get(Calendar.MONTH) + 1) + "/" - + calendar.get(Calendar.YEAR); + + (calendar.get(Calendar.MONTH) + 1) + "/" + + calendar.get(Calendar.YEAR); } private String getTimeZone(Calendar calendar) { @@ -102,5 +102,7 @@ private String getFormattedValue(Calendar calendar, int calendarField) { public JPanel getContentPanel() { return contentPanel; } + } + }