From d544d499ba8a7821c9213fd414e7e27342d9d633 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Sun, 10 Aug 2014 17:12:06 +0200 Subject: [PATCH] fix debugger tests --- .../src/com/intellij/debugger/DebuggerTestCase.java | 1 - .../intellij/xdebugger/impl/breakpoints/XExpressionImpl.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java index f7a9365f2441..9bb498b4bf73 100644 --- a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java +++ b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java @@ -569,5 +569,4 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas //To change body of implemented methods use File | Settings | File Templates. } } - } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XExpressionImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XExpressionImpl.java index b966377a47ba..d049356247b4 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XExpressionImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XExpressionImpl.java @@ -18,6 +18,7 @@ package com.intellij.xdebugger.impl.breakpoints; import com.intellij.lang.Language; import com.intellij.xdebugger.XExpression; import com.intellij.xdebugger.evaluation.EvaluationMode; +import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -65,12 +66,12 @@ public class XExpressionImpl implements XExpression { return myMode; } - @Nullable + @Contract("null -> null; !null -> !null") public static XExpressionImpl fromText(@Nullable String text) { return text != null ? new XExpressionImpl(text, null, null, EvaluationMode.EXPRESSION) : null; } - @Nullable + @Contract("null, _ -> null; !null, _ -> !null") public static XExpressionImpl fromText(@Nullable String text, EvaluationMode mode) { return text != null ? new XExpressionImpl(text, null, null, mode) : null; }