i18n: Add more annotations for stream-debugger (IDEA-249462)

GitOrigin-RevId: 4a5bc42e2b1005a391e2924a8aacd3ec3a4c6416
This commit is contained in:
Vitaliy.Bibaev
2020-09-03 03:31:45 +00:00
committed by intellij-monorepo-bot
parent 533d78fa0b
commit 29a65e5f06
16 changed files with 42 additions and 27 deletions
@@ -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
}
@@ -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
}
@@ -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();
@@ -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
@@ -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
}
@@ -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 {
@@ -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);
}
@@ -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
@@ -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 {
@@ -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();
}
@@ -12,8 +12,7 @@ import java.util.List;
*/
public interface MethodCall {
@NotNull
@NlsSafe
String getName();
@NlsSafe String getName();
@NotNull
List<CallArgument> getArguments();
@@ -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();
@@ -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;
}
}
@@ -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
@@ -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;
}
@@ -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<StreamCall> 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)) {