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: + *
+ * 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 @@
* 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.