From 29a65e5f06a9248eea6cb58d4ec5b08f0edef925 Mon Sep 17 00:00:00 2001 From: "Vitaliy.Bibaev" Date: Thu, 3 Sep 2020 10:31:45 +0700 Subject: [PATCH] i18n: Add more annotations for stream-debugger (IDEA-249462) GitOrigin-RevId: 4a5bc42e2b1005a391e2924a8aacd3ec3a4c6416 --- .../com/intellij/debugger/streams/lib/HandlerFactory.kt | 3 ++- .../intellij/debugger/streams/lib/InterpreterFactory.kt | 3 ++- .../debugger/streams/lib/LibrarySupportProvider.java | 4 +++- .../src/com/intellij/debugger/streams/lib/Operation.kt | 2 ++ .../com/intellij/debugger/streams/lib/ResolverFactory.kt | 3 ++- .../streams/lib/impl/IntermediateOperationBase.kt | 3 ++- .../debugger/streams/trace/TraceExpressionBuilder.java | 3 ++- .../intellij/debugger/streams/trace/dsl/Convertable.kt | 3 +++ .../streams/trace/impl/handler/type/GenericType.kt | 6 ++++++ .../intellij/debugger/streams/wrapper/CallArgument.java | 7 +++---- .../com/intellij/debugger/streams/wrapper/MethodCall.java | 3 +-- .../intellij/debugger/streams/wrapper/StreamChain.java | 7 +++---- .../debugger/streams/wrapper/impl/CallArgumentImpl.java | 7 +++---- .../streams/wrapper/impl/QualifierExpressionImpl.kt | 3 ++- .../debugger/streams/wrapper/impl/StreamCallImpl.java | 4 ++-- .../debugger/streams/wrapper/impl/StreamChainImpl.java | 8 ++++---- 16 files changed, 42 insertions(+), 27 deletions(-) diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/HandlerFactory.kt b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/HandlerFactory.kt index 182fd0807377..322abd8bce2a 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/HandlerFactory.kt +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/HandlerFactory.kt @@ -5,11 +5,12 @@ import com.intellij.debugger.streams.trace.IntermediateCallHandler import com.intellij.debugger.streams.trace.TerminatorCallHandler import com.intellij.debugger.streams.wrapper.IntermediateStreamCall import com.intellij.debugger.streams.wrapper.TerminatorStreamCall +import org.jetbrains.annotations.NonNls /** * @author Vitaliy.Bibaev */ interface HandlerFactory { fun getForIntermediate(number: Int, call: IntermediateStreamCall): IntermediateCallHandler - fun getForTermination(call: TerminatorStreamCall, resultExpression: String): TerminatorCallHandler + fun getForTermination(call: TerminatorStreamCall, @NonNls resultExpression: String): TerminatorCallHandler } \ No newline at end of file diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/InterpreterFactory.kt b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/InterpreterFactory.kt index c0f2c39afefd..7dfe24faa91d 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/InterpreterFactory.kt +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/InterpreterFactory.kt @@ -2,10 +2,11 @@ package com.intellij.debugger.streams.lib import com.intellij.debugger.streams.trace.CallTraceInterpreter +import com.intellij.openapi.util.NlsSafe /** * @author Vitaliy.Bibaev */ interface InterpreterFactory { - fun getInterpreter(callName: String): CallTraceInterpreter + fun getInterpreter(@NlsSafe callName: String): CallTraceInterpreter } \ No newline at end of file diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/LibrarySupportProvider.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/LibrarySupportProvider.java index 9b272e0921ed..ab044950c8ae 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/LibrarySupportProvider.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/LibrarySupportProvider.java @@ -5,6 +5,8 @@ import com.intellij.debugger.streams.trace.TraceExpressionBuilder; import com.intellij.debugger.streams.wrapper.StreamChainBuilder; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.NlsSafe; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -21,7 +23,7 @@ public interface LibrarySupportProvider { } @NotNull - String getLanguageId(); + @NonNls String getLanguageId(); @NotNull StreamChainBuilder getChainBuilder(); diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/Operation.kt b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/Operation.kt index 281452082acb..0b8620fe8671 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/Operation.kt +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/Operation.kt @@ -8,11 +8,13 @@ import com.intellij.debugger.streams.trace.TerminatorCallHandler import com.intellij.debugger.streams.trace.dsl.Dsl import com.intellij.debugger.streams.wrapper.IntermediateStreamCall import com.intellij.debugger.streams.wrapper.TerminatorStreamCall +import com.intellij.openapi.util.NlsSafe /** * @author Vitaliy.Bibaev */ interface Operation { + @get:NlsSafe val name: String val traceInterpreter: CallTraceInterpreter diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/ResolverFactory.kt b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/ResolverFactory.kt index d865eaf1e471..1a83974c441e 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/ResolverFactory.kt +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/ResolverFactory.kt @@ -2,10 +2,11 @@ package com.intellij.debugger.streams.lib import com.intellij.debugger.streams.resolve.ValuesOrderResolver +import com.intellij.openapi.util.NlsSafe /** * @author Vitaliy.Bibaev */ interface ResolverFactory { - fun getResolver(callName: String): ValuesOrderResolver + fun getResolver(@NlsSafe callName: String): ValuesOrderResolver } \ No newline at end of file diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/impl/IntermediateOperationBase.kt b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/impl/IntermediateOperationBase.kt index d311e10a1d0a..c4c82c513259 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/impl/IntermediateOperationBase.kt +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/lib/impl/IntermediateOperationBase.kt @@ -7,11 +7,12 @@ import com.intellij.debugger.streams.trace.CallTraceInterpreter import com.intellij.debugger.streams.trace.IntermediateCallHandler import com.intellij.debugger.streams.trace.dsl.Dsl import com.intellij.debugger.streams.wrapper.IntermediateStreamCall +import com.intellij.openapi.util.NlsSafe /** * @author Vitaliy.Bibaev */ -abstract class IntermediateOperationBase(override val name: String, +abstract class IntermediateOperationBase(override val name: @NlsSafe String, private val handlerFactory: (Int, IntermediateStreamCall, Dsl) -> IntermediateCallHandler, override val traceInterpreter: CallTraceInterpreter, override val valuesOrderResolver: ValuesOrderResolver) : IntermediateOperation { diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/TraceExpressionBuilder.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/TraceExpressionBuilder.java index 8e16d5ee8596..4abbd3b46e06 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/TraceExpressionBuilder.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/TraceExpressionBuilder.java @@ -2,6 +2,7 @@ package com.intellij.debugger.streams.trace; import com.intellij.debugger.streams.wrapper.StreamChain; +import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -10,5 +11,5 @@ import org.jetbrains.annotations.NotNull; */ public interface TraceExpressionBuilder { @NotNull - String createTraceExpression(@NotNull StreamChain chain); + @NonNls String createTraceExpression(@NotNull StreamChain chain); } diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/Convertable.kt b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/Convertable.kt index 90d861ca4f10..0a5aee5997bc 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/Convertable.kt +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/dsl/Convertable.kt @@ -1,10 +1,13 @@ // Copyright 2000-2017 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.debugger.streams.trace.dsl +import org.jetbrains.annotations.NonNls + /** * @author Vitaliy.Bibaev */ interface Convertable { + @NonNls fun toCode(indent: Int = 0): String fun String.withIndent(indent: Int): String = " ".repeat(indent) + this diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/handler/type/GenericType.kt b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/handler/type/GenericType.kt index 6772c8f0fc4f..eb302d9587ea 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/handler/type/GenericType.kt +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/trace/impl/handler/type/GenericType.kt @@ -1,14 +1,20 @@ // Copyright 2000-2017 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.debugger.streams.trace.impl.handler.type +import com.intellij.openapi.util.NlsSafe + + /** * @author Vitaliy.Bibaev */ interface GenericType { + @get:NlsSafe val variableTypeName: String + @get:NlsSafe val genericTypeName: String + @get:NlsSafe val defaultValue: String interface CompositeType : GenericType { diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/CallArgument.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/CallArgument.java index cebabbee4968..897683a7eb14 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/CallArgument.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/CallArgument.java @@ -1,15 +1,14 @@ // Copyright 2000-2017 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.debugger.streams.wrapper; +import com.intellij.openapi.util.NlsSafe; import org.jetbrains.annotations.NotNull; /** * @author Vitaliy.Bibaev */ public interface CallArgument { - @NotNull - String getType(); + @NotNull @NlsSafe String getType(); - @NotNull - String getText(); + @NotNull @NlsSafe String getText(); } diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/MethodCall.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/MethodCall.java index 978c29586266..c987c847fbb7 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/MethodCall.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/MethodCall.java @@ -12,8 +12,7 @@ import java.util.List; */ public interface MethodCall { @NotNull - @NlsSafe - String getName(); + @NlsSafe String getName(); @NotNull List getArguments(); diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/StreamChain.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/StreamChain.java index 608e5f344894..e4a49d4e6254 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/StreamChain.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/StreamChain.java @@ -1,6 +1,7 @@ // Copyright 2000-2017 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.debugger.streams.wrapper; +import com.intellij.openapi.util.NlsSafe; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; @@ -23,11 +24,9 @@ public interface StreamChain { @NotNull TerminatorStreamCall getTerminationCall(); - @NotNull - String getText(); + @NotNull @NlsSafe String getText(); - @NotNull - String getCompactText(); + @NotNull @NlsSafe String getCompactText(); int length(); diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/CallArgumentImpl.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/CallArgumentImpl.java index d92a1c6afd7f..5060873ea49c 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/CallArgumentImpl.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/CallArgumentImpl.java @@ -2,6 +2,7 @@ package com.intellij.debugger.streams.wrapper.impl; import com.intellij.debugger.streams.wrapper.CallArgument; +import com.intellij.openapi.util.NlsSafe; import org.jetbrains.annotations.NotNull; /** @@ -16,15 +17,13 @@ public class CallArgumentImpl implements CallArgument { myText = text; } - @NotNull @Override - public String getType() { + public @NotNull @NlsSafe String getType() { return myType; } - @NotNull @Override - public String getText() { + public @NotNull @NlsSafe String getText() { return myText; } } diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/QualifierExpressionImpl.kt b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/QualifierExpressionImpl.kt index cc89db185863..ebc7bfb89bfe 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/QualifierExpressionImpl.kt +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/QualifierExpressionImpl.kt @@ -3,12 +3,13 @@ package com.intellij.debugger.streams.wrapper.impl import com.intellij.debugger.streams.trace.impl.handler.type.GenericType import com.intellij.debugger.streams.wrapper.QualifierExpression +import com.intellij.openapi.util.NlsSafe import com.intellij.openapi.util.TextRange /** * @author Vitaliy.Bibaev */ -class QualifierExpressionImpl(override val text: String, +class QualifierExpressionImpl(override val text: @NlsSafe String, override val textRange: TextRange, private val typeAfter: GenericType) : QualifierExpression { override fun getTypeAfter(): GenericType = typeAfter diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/StreamCallImpl.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/StreamCallImpl.java index 322c0d4e710d..da97e7694f3a 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/StreamCallImpl.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/StreamCallImpl.java @@ -4,6 +4,7 @@ package com.intellij.debugger.streams.wrapper.impl; import com.intellij.debugger.streams.wrapper.CallArgument; import com.intellij.debugger.streams.wrapper.StreamCall; import com.intellij.debugger.streams.wrapper.StreamCallType; +import com.intellij.openapi.util.NlsSafe; import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; @@ -34,9 +35,8 @@ public abstract class StreamCallImpl implements StreamCall { return myTextRange; } - @NotNull @Override - public String getName() { + public @NotNull @NlsSafe String getName() { return myName; } diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/StreamChainImpl.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/StreamChainImpl.java index 2f3b9f2d1a6c..b7cf9256583f 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/StreamChainImpl.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/wrapper/impl/StreamChainImpl.java @@ -2,6 +2,7 @@ package com.intellij.debugger.streams.wrapper.impl; import com.intellij.debugger.streams.wrapper.*; +import com.intellij.openapi.util.NlsSafe; import com.intellij.psi.PsiElement; import one.util.streamex.StreamEx; import org.jetbrains.annotations.NotNull; @@ -57,9 +58,8 @@ public class StreamChainImpl implements StreamChain { return myTerminator; } - @NotNull @Override - public String getText() { + public @NotNull @NlsSafe String getText() { final Iterator iterator = StreamEx.of(myIntermediateCalls).map(x -> (StreamCall)x).append(myTerminator).iterator(); final StringBuilder builder = new StringBuilder(); builder.append(myQualifierExpression.getText()).append("\n").append("."); @@ -76,9 +76,9 @@ public class StreamChainImpl implements StreamChain { return builder.toString(); } - @NotNull + @Override - public String getCompactText() { + public @NotNull @NlsSafe String getCompactText() { final StringBuilder builder = new StringBuilder(); builder.append(myQualifierExpression.getText().replaceAll("\\s+", "")); for (final StreamCall call : StreamEx.of(myIntermediateCalls).map(x -> (StreamCall)x).append(myTerminator)) {