From 2b2ad5068077a67803c45100b4eda9a1da99c983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Tue, 2 Mar 2021 18:47:17 +0100 Subject: [PATCH] replace "the the" -> "the" + minor javadoc cleanup GitOrigin-RevId: 6dd2e60918da4054b185ac025abacab32b8a912b --- .../java/generate/config/PolicyOptions.java | 10 +++++----- .../formatter/java/wrap/JavaWrapManager.java | 4 ++-- .../wrap/impl/JavaChildBlockWrapFactory.java | 4 ++-- .../src/windows/WindowsCryptUtils.java | 6 +++--- .../editorActions/MatchBraceAction.java | 14 +++++++------ .../openapi/options/ConfigurableEP.java | 4 ++-- .../fields/valueEditors/ValueEditor.java | 4 ++-- .../progress/util/ProgressIndicatorUtils.java | 4 ++-- .../openapi/project/DumbServiceImpl.java | 4 ++-- .../vfs/newvfs/impl/VfsRootAccess.java | 4 ++-- .../ProcessHandshakeLauncher.kt | 4 ++-- .../util/resources/misc/registry.properties | 2 +- .../com/intellij/util/ui/JBScalableIcon.java | 20 +++++++++++-------- .../com/intellij/openapi/vcs/AbstractVcs.java | 6 +++--- .../org/jetbrains/java/generate/package.html | 2 +- .../src/git4idea/changes/GitChangeUtils.java | 6 +++--- .../git4idea/util/ScriptGenerator.java | 4 ++-- .../resolve/NonCodeMembersContributor.java | 4 ++-- .../lang/properties/psi/PropertiesFile.java | 10 +++++----- 19 files changed, 61 insertions(+), 55 deletions(-) diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/PolicyOptions.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/PolicyOptions.java index e0382a35fa99..c641d27a81ad 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/PolicyOptions.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/PolicyOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2001-2013 the original author or authors. + * Copyright 2001-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,16 +29,16 @@ public final class PolicyOptions { private PolicyOptions() {} /** - * Gets the options for the the insert new method policy. - * @return the options for the the insert new method policy. + * Gets the options for the insert new method policy. + * @return the options for the insert new method policy. */ public static InsertWhere @NotNull [] getNewMethodOptions() { return newMethodOptions; } /** - * Gets the options for the the conflict resolution policy. - * @return the options for the the conflict resolution policy. + * Gets the options for the conflict resolution policy. + * @return the options for the conflict resolution policy. */ public static DuplicationPolicy @NotNull [] getConflictOptions() { return conflictOptions; diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java index 3c2d9fadfd6c..30a6653a559a 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/JavaWrapManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2021 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ public class JavaWrapManager { } /** - * Creates {@link Wrap wrap} to be used with the children blocks of the the given block. + * Creates {@link Wrap wrap} to be used with the children blocks of the given block. * * @param block target block which sub-blocks should use wrap created by the current method * @param settings code formatting settings to consider during wrap construction diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildBlockWrapFactory.java b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildBlockWrapFactory.java index ce2177c636f0..099af83bdc23 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildBlockWrapFactory.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/wrap/impl/JavaChildBlockWrapFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2010 JetBrains s.r.o. + * Copyright 2000-2021 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable; public class JavaChildBlockWrapFactory { /** - * Creates {@link Wrap wrap} to be used with the children blocks of the the given block. + * Creates {@link Wrap wrap} to be used with the children blocks of the given block. * * @param block target block which sub-blocks should use wrap created by the current method * @param settings code formatting settings to consider during wrap construction diff --git a/platform/credential-store/src/windows/WindowsCryptUtils.java b/platform/credential-store/src/windows/WindowsCryptUtils.java index ec19c97e6170..9df5bb4a96c5 100644 --- a/platform/credential-store/src/windows/WindowsCryptUtils.java +++ b/platform/credential-store/src/windows/WindowsCryptUtils.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.credentialStore.windows; import com.sun.jna.Memory; @@ -17,7 +17,7 @@ public final class WindowsCryptUtils { * Protect the specified byte range * * @param data the data to protect - * @return the the protected form the data + * @return the protected form of the data */ public static byte @NotNull [] protect(byte @NotNull [] data) { if (data.length == 0) return data; @@ -31,7 +31,7 @@ public final class WindowsCryptUtils { * Unprotect the specified byte range * * @param data the data to protect - * @return the the protected form the data + * @return the unprotected form of the data */ public static byte @NotNull [] unprotect(byte[] data) { if (data.length == 0) return data; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/MatchBraceAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/MatchBraceAction.java index 15fc684462e2..67762da891fb 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/MatchBraceAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/MatchBraceAction.java @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.codeInsight.editorActions; import com.intellij.codeInsight.highlighting.BraceHighlightingHandler; @@ -23,11 +23,13 @@ import com.intellij.psi.util.PsiUtilBase; import org.jetbrains.annotations.NotNull; /** - * Moves caret to the the matching brace: - * - If caret is on the closing brace - moves in the beginning of the matching opening brace - * - If caret is on the opening brace - moves to the end of the matching closing brace - * - Otherwise moves from the caret position to the beginning of the file and finds first opening brace not closed before the caret position - */ + * Moves caret to the matching brace: + * + **/ public class MatchBraceAction extends EditorAction { public MatchBraceAction() { super(new MyHandler()); diff --git a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java index 58a3bd86ae99..7d0e48a1cc16 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java +++ b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.options; import com.intellij.BundleBase; @@ -383,7 +383,7 @@ public class ConfigurableEP implements PluginAwar * Returns the type of configurable to create or {@code null}, * if it cannot be determined. * - * @return the the configurable's type or {@code null} + * @return the configurable's type or {@code null} */ @Nullable public Class getConfigurableType() { diff --git a/platform/platform-api/src/com/intellij/ui/components/fields/valueEditors/ValueEditor.java b/platform/platform-api/src/com/intellij/ui/components/fields/valueEditors/ValueEditor.java index 62847afc01ce..dbb19512eee0 100644 --- a/platform/platform-api/src/com/intellij/ui/components/fields/valueEditors/ValueEditor.java +++ b/platform/platform-api/src/com/intellij/ui/components/fields/valueEditors/ValueEditor.java @@ -1,4 +1,4 @@ -// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ui.components.fields.valueEditors; import com.intellij.openapi.options.Configurable; @@ -67,7 +67,7 @@ public interface ValueEditor { String valueToString(@NotNull T value); /** - * Check the the given value is valid. For example, an integer number is within an expected range and so on. + * Check the given value is valid. For example, an integer number is within an expected range and so on. * @param value The value to check. */ boolean isValid(@NotNull T value); diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java index accb2fdfaea8..48b6fbf86dd7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java +++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressIndicatorUtils.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.progress.util; import com.intellij.codeWithMe.ClientId; @@ -292,7 +292,7 @@ public final class ProgressIndicatorUtils { /** * Run the given computation with its execution time restricted to the given amount of time in milliseconds.

* - * Internally, it creates a new {@link ProgressIndicator}, runs the computation with that indicator and cancels it after the the timeout. + * Internally, it creates a new {@link ProgressIndicator}, runs the computation with that indicator and cancels it after the timeout. * The computation should call {@link ProgressManager#checkCanceled()} frequently enough, so that after the timeout has been exceeded * it can stop the execution by throwing {@link ProcessCanceledException}, which will be caught by this {@code withTimeout}.

* diff --git a/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java index a469c4140447..71b45a4c8d5d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.project; import com.google.common.annotations.VisibleForTesting; @@ -630,7 +630,7 @@ public class DumbServiceImpl extends DumbService implements Disposable, Modifica finally { shutdownTracker.unregisterStopperThread(self); // myCurrentSuspender should already be null at this point unless we got here by exception. In any case, the suspender might have - // got suspended after the the last dumb task finished (or even after the last check cancelled call). This case is handled by + // got suspended after the last dumb task finished (or even after the last check cancelled call). This case is handled by // the ProgressSuspender close() method called at the exit of this try-with-resources block which removes the hook if it has been // previously installed. myHeavyActivities.resetCurrentSuspender(); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java index f332bd151efc..76f671a9c613 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.vfs.newvfs.impl; import com.intellij.openapi.Disposable; @@ -120,7 +120,7 @@ public final class VfsRootAccess { allowed.add(FileUtil.toSystemIndependentName(findInUserHome(".m2"))); allowed.add(FileUtil.toSystemIndependentName(findInUserHome(".gradle"))); - // see IDEA-167037 The assertion "File accessed outside allowed root" is triggered by files symlinked from the the JDK installation folder + // see IDEA-167037 The assertion "File accessed outside allowed root" is triggered by files symlinked from the JDK installation folder allowed.add("/etc"); // After recent update of Oracle JDK 1.8 under Ubuntu Certain files in the JDK installation are symlinked to /etc allowed.add("/private/etc"); diff --git a/platform/platform-impl/src/com/intellij/util/io/processHandshake/ProcessHandshakeLauncher.kt b/platform/platform-impl/src/com/intellij/util/io/processHandshake/ProcessHandshakeLauncher.kt index f74082f8fe33..7d3fbfac64a6 100644 --- a/platform/platform-impl/src/com/intellij/util/io/processHandshake/ProcessHandshakeLauncher.kt +++ b/platform/platform-impl/src/com/intellij/util/io/processHandshake/ProcessHandshakeLauncher.kt @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. @file:Suppress("EXPERIMENTAL_API_USAGE") package com.intellij.util.io.processHandshake @@ -30,7 +30,7 @@ abstract class ProcessHandshakeLauncher, R> /** * The launcher process might exit without waiting for the target process to finish, * in which case it can also exit before the target process writes the handshake response. - * This timeout gives the the handshake a chance to be read even after the launcher process has finished. + * This timeout gives the handshake a chance to be read even after the launcher process has finished. */ protected open val handshakeTimeoutAfterLauncherFinishedMillis: Long = 5000 diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index f57af0f2be6c..804232af43f4 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -558,7 +558,7 @@ compiler.automake.trigger.delay=300 compiler.automake.trigger.delay.description=Delay in milliseconds before triggering auto-make in response to file system events compiler.automake.postpone.when.idle.less.than=3000 -compiler.automake.postpone.when.idle.less.than.description=If at the moment the autobuild is about to start the IDE is idle for less than specified milliseconds, the the automatic build will be postponed in order not to interfere with the user's activity. +compiler.automake.postpone.when.idle.less.than.description=If at the moment the autobuild is about to start the IDE is idle for less than specified milliseconds, the automatic build will be postponed in order not to interfere with the user's activity. compiler.automake.allow.when.app.running=false compiler.automake.allow.when.app.running.description=Allow auto-make to start even if developed application is currently running. Note that automatically started make may eventually delete some classes that are required by the application. diff --git a/platform/util/ui/src/com/intellij/util/ui/JBScalableIcon.java b/platform/util/ui/src/com/intellij/util/ui/JBScalableIcon.java index 111bf59463ef..f42d13030f69 100644 --- a/platform/util/ui/src/com/intellij/util/ui/JBScalableIcon.java +++ b/platform/util/ui/src/com/intellij/util/ui/JBScalableIcon.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.util.ui; import com.intellij.openapi.util.ScalableIcon; @@ -52,19 +52,23 @@ public abstract class JBScalableIcon extends AbstractScaleContextAware + *
  • scale its initial size right away and store
    • + *
  • scale its initial size every time it's requested
    • + * + *

    + * The 2nd approach is preferable because of the following. Scaling of the icon may * involve not only USR_SCALE but OBJ_SCALE as well. In which case applying all the scale * factors and then rounding (the size is integer, the scale factors are not) gives more * accurate result than rounding and then scaling. *

    * For example, say we have an icon of 15x15 initial size, USR_SCALE is 1.5f, OBJ_SCALE is 1,5f. - * Math.round(Math.round(15 * USR_SCALE) * OBJ_SCALE) = 35 - * Math.round(15 * USR_SCALE * OBJ_SCALE) = 34 + * {@code Math.round(Math.round(15 * USR_SCALE) * OBJ_SCALE) = 35} + *
    + * {@code Math.round(15 * USR_SCALE * OBJ_SCALE) = 34} *

    - * Thus, JBUI.scale(MyIcon.create(w, h)) is preferable to MyIcon.create(JBUI.scale(w), JBUI.scale(h)). + * Thus, {@code JBUI.scale(MyIcon.create(w, h))} is preferable to {@code MyIcon.create(JBUI.scale(w), JBUI.scale(h))}. * Here [w, h] is "raw" unscaled size. * * @param preScaled whether the icon is pre-scaled diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java index 13df61805641..42b0b7dd9a96 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.vcs; import com.intellij.openapi.diff.impl.patch.formove.FilePathComparator; @@ -36,7 +36,7 @@ import java.util.List; import java.util.function.Function; /** - * The base class for a version control system integrated with IDEA. + * The base class for a version control system. * * @see ProjectLevelVcsManager */ @@ -379,7 +379,7 @@ public abstract class AbstractVcs extends StartedActivated { /** * For some version controls (like Git) the revision parsing is dependent - * on the the specific repository instance since the the revision number + * on the specific repository instance since the the revision number * returned from this method is later used for comparison information. * By default, this method invokes {@link #parseRevisionNumber(String)}. * The client code should invoke this method, if it expect ordering information diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/package.html b/plugins/generate-tostring/src/org/jetbrains/java/generate/package.html index aa0881be31a9..42769801ae1d 100644 --- a/plugins/generate-tostring/src/org/jetbrains/java/generate/package.html +++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/package.html @@ -343,7 +343,7 @@ $class.superQualifiedNameStringThe fully qualified name of the superclass (empty if no superclass) $class.implements(interfaceNames)booleanTests if the class implements the given interface name. Testing several interfaces names can be done by separating the names with comma. Tests is based using the short classname. $class.implementNamesString[]Returns the classnames of the interfaces the class implements. An empty array is returned if the class does not implement any interfaces. - $class.extends(classNames)booleanTests if the class extends any of the the given class names. Testing several class names can be done by separating the names with comma. Tests is based using the short classname. + $class.extends(classNames)booleanTests if the class extends any of the given class names. Testing several class names can be done by separating the names with comma. Tests is based using the short classname. $class.exceptionbooleanIs this class an exception class (extends Throwable)? $class.deprecatedbooleanIs this class deprecated? $class.enumbooleanIs this class an enum class? diff --git a/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java b/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java index c04dc8ed4d09..f5291903b775 100644 --- a/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java +++ b/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package git4idea.changes; import com.intellij.openapi.diagnostic.Logger; @@ -192,9 +192,9 @@ public final class GitChangeUtils { /** * Get list of changes. Because native Git non-linear revision tree structure is not - * supported by the current IDEA interfaces some simplifications are made in the case + * supported by the current IDE interfaces some simplifications are made in the case * of the merge, so changes are reported as difference with the first revision - * listed on the the merge that has at least some changes. + * listed on the merge that has at least some changes. * * @param project the project file * @param root the git root diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java b/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java index 7fb748e5be79..3e88bb3b5ee5 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.git4idea.util; import com.intellij.openapi.application.PathManager; @@ -114,7 +114,7 @@ public class ScriptGenerator { } /** - * @return a command line for the the executable program + * @return a command line for the executable program */ @NonNls public String commandLine(@NotNull GitExecutable executable) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/NonCodeMembersContributor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/NonCodeMembersContributor.java index 5d731054b5cb..47f41dfca4d5 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/NonCodeMembersContributor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/NonCodeMembersContributor.java @@ -1,4 +1,4 @@ -// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.plugins.groovy.lang.resolve; import com.intellij.openapi.extensions.ExtensionPointListener; @@ -39,7 +39,7 @@ import static org.jetbrains.plugins.groovy.lang.resolve.noncode.MixinMemberContr *

  • Ensure that the element name is right. *

    * Ask processor for the name: {@code val nameHint = processor.getHint(NameHint.KEY)}.
    - * If the hint is {@code null} or the the name ({@code nameHint.getName(resolveState)}) is {@code null} + * If the hint is {@code null} or the name ({@code nameHint.getName(resolveState)}) is {@code null} * then processor doesn't care about the name, so the contributor is free to feed the processor with whatever elements. * This usually happens when completion is in progress.
    * If the name is not {@code null} then the contributor has to feed processor with properly named elements. diff --git a/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/psi/PropertiesFile.java b/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/psi/PropertiesFile.java index e52d112e621e..1055b3a58367 100644 --- a/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/psi/PropertiesFile.java +++ b/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/psi/PropertiesFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2021 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -86,10 +86,10 @@ public interface PropertiesFile { PsiElement addProperty(@NotNull IProperty property) throws IncorrectOperationException; /** - * Adds property to the the file after the specified property. - * If anchor is null, property added to the beginning of the file. + * Adds property to the file after the specified property. + * If anchor is null, property is added to the beginning of the file. * - * In the most cases one can consider to use {@link PropertiesFile#addPropertyAfter(String, String, IProperty)} instead of this method + * In most cases one can consider to use {@link PropertiesFile#addPropertyAfter(String, String, IProperty)} instead of this method. * * @param property to add. Typically you create the property via {@link PropertiesElementFactory}. * @param anchor property after which to add the new property @@ -100,7 +100,7 @@ public interface PropertiesFile { PsiElement addPropertyAfter(@NotNull IProperty property, @Nullable IProperty anchor) throws IncorrectOperationException; /** - * Adds property to the the file after the specified property. + * Adds property to the file after the specified property. * If anchor is null, property added to the beginning of the file. * * @param key of a property to add.