MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

'indexOf' -> 'contains'

Browse Source 
GitOrigin-RevId: ff741fb2aa565fefa54c6a479947ea5f8c837d0c
This commit is contained in:
Tagir Valeev
2019-07-25 10:03:44 +03:00
committed by intellij-monorepo-bot
parent 3e12574595
commit 0f3d493cb9
12 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java
+1 -1
View File
@@ -92,7 +92,7 @@ public class CompilerErrorTreeView extends NewErrorTreeViewPanel {
final NavigatableMessageElement messageElement = (NavigatableMessageElement)errorTreeElement;
final String[] text = messageElement.getText();
if (text.length > 0) {
if (text[0].startsWith("[") && text[0].indexOf("]") != -1) {
if (text[0].startsWith("[") && text[0].contains("]")) {
final Navigatable navigatable = messageElement.getNavigatable();
if (navigatable instanceof OpenFileDescriptor) {
final OpenFileDescriptor fileDescriptor = (OpenFileDescriptor)navigatable;
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/PsiBasedFormatterModelWithShiftIndentInside.java
+2 -2
View File
@@ -79,7 +79,7 @@ public class PsiBasedFormatterModelWithShiftIndentInside extends PsiBasedFormatt
@NonNls final String cdataStartMarker = "<![CDATA[";
final int cdataPos = text.indexOf(cdataStartMarker);
if (cdataPos != -1 && whiteSpace.indexOf(cdataStartMarker) == -1) {
if (cdataPos != -1 && !whiteSpace.contains(cdataStartMarker)) {
whiteSpace = DocumentBasedFormattingModel.mergeWsWithCdataMarker(whiteSpace, text, cdataPos);
if (whiteSpace == null) return null;
}
@@ -89,7 +89,7 @@ public class PsiBasedFormatterModelWithShiftIndentInside extends PsiBasedFormatt
}
@NonNls final String cdataEndMarker = "]]>";
if(type == XmlTokenType.XML_CDATA_END && whiteSpace.indexOf(cdataEndMarker) == -1) {
if(type == XmlTokenType.XML_CDATA_END && !whiteSpace.contains(cdataEndMarker)) {
final ASTNode at = findElementAt(prevNode.getStartOffset());
if (at != null && at.getPsi() instanceof PsiWhiteSpace) {
jps/antLayout/src/jetbrains/antlayout/datatypes/JarContainer.java
+1 -1
View File
@@ -16,7 +16,7 @@ public class JarContainer extends ZipContainer {
protected Zip createTask() {
String version = Main.getAntVersion();
Jar task;
if (version != null && (version.indexOf("1.8.0") != -1 || version.indexOf("1.8.1") != -1)) {
if (version != null && (version.contains("1.8.0") || version.contains("1.8.1"))) {
task = new PatchedJar();
}
else {
platform/platform-impl/src/com/intellij/openapi/wm/ex/IdeFocusTraversalPolicy.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class IdeFocusTraversalPolicy extends LayoutFocusTraversalPolicyExt {
final FocusTraversalPolicy focusTraversalPolicy = getFocusTraversalPolicyAwtImpl(component);
if (focusTraversalPolicy != null && focusTraversalPolicy != policyToIgnore) {
if (focusTraversalPolicy.getClass().getName().indexOf("LegacyGlueFocusTraversalPolicy") >=0) {
if (focusTraversalPolicy.getClass().getName().contains("LegacyGlueFocusTraversalPolicy")) {
return component;
}
plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class AntUIUtil {
String name = AntInstallation.NAME.get(antProperties);
component.append(name, SimpleTextAttributes.REGULAR_ATTRIBUTES);
String versionString = AntInstallation.VERSION.get(antProperties);
if (name.indexOf(versionString) == -1)
if (!name.contains(versionString))
component.append(" (" + versionString + ")", SimpleTextAttributes.SYNTHETIC_ATTRIBUTES);
}
plugins/ant/src/com/intellij/lang/ant/dom/PropertyExpander.java
+1 -1
View File
@@ -172,7 +172,7 @@ public class PropertyExpander {
String getResult() {
final String value = myBuilder.toString();
if (value.indexOf("$$") >= 0) {
if (value.contains("$$")) {
return $$_PATTERN.matcher(value).replaceAll("\\$");
}
return value;
plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/RequestProcessor.java
+1 -1
View File
@@ -318,7 +318,7 @@ public final class RequestProcessor implements IRequestProcessor {
}
private boolean isValidRequest(String request) {
return responseServices.getValidRequests().indexOf(request) >= 0;
return responseServices.getValidRequests().contains(request);
}
private void sendRequest(IRequest request, IConnectionStreams connectionStreams) throws CommandAbortedException, IOException {
plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/command/update/UpdateMessageParser.java
+2 -2
View File
@@ -103,7 +103,7 @@ public final class UpdateMessageParser extends AbstractMessageParser implements
return;
}
if (line.indexOf(EXAM_DIR) >= 0) {
if (line.contains(EXAM_DIR)) {
return;
}
@@ -171,7 +171,7 @@ public final class UpdateMessageParser extends AbstractMessageParser implements
if (line.length() > 2) {
if (line.charAt(1) == ' ') {
final String firstChar = line.substring(0, 1);
if (STATES.indexOf(firstChar) >= 0) {
if (STATES.contains(firstChar)) {
processFile(line.substring(2), firstChar);
}
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java
+1 -1
View File
@@ -184,7 +184,7 @@ class ModeReference extends SimpleAttributeReference implements PsiPolyVariantRe
public boolean matches(XmlTag element) {
final String s = element.getAttributeValue("mode");
return myMode != null &&
s != null && s.indexOf(CompletionInitializationContext.DUMMY_IDENTIFIER_TRIMMED) == -1 &&
s != null && !s.contains(CompletionInitializationContext.DUMMY_IDENTIFIER_TRIMMED) &&
super.matches(element);
}
python/src/com/jetbrains/python/console/PydevConsoleCommunication.java
+1 -1
View File
@@ -377,7 +377,7 @@ public abstract class PydevConsoleCommunication extends AbstractConsoleCommunica
// This string always works,
// because it is hard-coded in
// the XML-RPC library)
if (executed.first != null && executed.first.indexOf(refusedConnPattern) != -1) {
if (executed.first != null && executed.first.contains(refusedConnPattern)) {
if (firstCommWorked) {
break;
}
python/src/com/jetbrains/python/lexer/PythonEditorHighlighter.java
+2 -2
View File
@@ -45,7 +45,7 @@ public class PythonEditorHighlighter extends LexerEditorHighlighter {
int offset = e.getOffset();
int lineNumber = document.getLineNumber(offset);
TextRange tr = new TextRange(document.getLineStartOffset(lineNumber), document.getLineEndOffset(lineNumber));
document.putUserData(KEY, document.getText(tr).indexOf(PyNames.UNICODE_LITERALS) == -1);
document.putUserData(KEY, !document.getText(tr).contains(PyNames.UNICODE_LITERALS));
Boolean hasUnicodeImport = document.getUserData(KEY);
if (delegate instanceof PythonHighlightingLexer &&
(((PythonHighlightingLexer)delegate).getImportOffset() > e.getOffset()
@@ -69,7 +69,7 @@ public class PythonEditorHighlighter extends LexerEditorHighlighter {
public void setEditor(@NotNull HighlighterClient editor) {
Lexer l = getLexer();
if (l instanceof LayeredLexer) {
editor.getDocument().putUserData(KEY, editor.getDocument().getText().indexOf(PyNames.UNICODE_LITERALS) == -1);
editor.getDocument().putUserData(KEY, !editor.getDocument().getText().contains(PyNames.UNICODE_LITERALS));
}
super.setEditor(editor);
}
xml/impl/src/com/intellij/lang/xml/XmlFormattingModel.java
+2 -2
View File
@@ -59,7 +59,7 @@ public class XmlFormattingModel extends PsiBasedFormattingModel {
final @NonNls String cdataStartMarker = "<![CDATA[";
final int cdataPos = text.indexOf(cdataStartMarker);
if (cdataPos != -1 && whiteSpace.indexOf(cdataStartMarker) == -1) {
if (cdataPos != -1 && !whiteSpace.contains(cdataStartMarker)) {
whiteSpace = mergeWsWithCdataMarker(whiteSpace, text, cdataPos);
if (whiteSpace == null) return null;
}
@@ -69,7 +69,7 @@ public class XmlFormattingModel extends PsiBasedFormattingModel {
}
final @NonNls String cdataEndMarker = "]]>";
if(type == XmlTokenType.XML_CDATA_END && whiteSpace.indexOf(cdataEndMarker) == -1) {
if(type == XmlTokenType.XML_CDATA_END && !whiteSpace.contains(cdataEndMarker)) {
final ASTNode at = findElementAt(prevNode.getStartOffset());
if (at != null && at.getPsi() instanceof PsiWhiteSpace) {