MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

'Mismatched collection query/update' warnings fixed or suppressed; redundant code removed

Browse Source 
GitOrigin-RevId: 5452da8520e2856faf0be47da4cb541b19105d8d
This commit is contained in:
Tagir Valeev
2024-06-18 17:10:40 +02:00
committed by intellij-monorepo-bot
parent df1679571e
commit fac9d78b59
5 changed files with 14 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
platform/core-impl/src/com/intellij/util/profiling/ProfileViewer.java
View File

@@ -1,178 +0,0 @@
/*
* Copyright 2000-2015 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.util.profiling;
import com.intellij.util.containers.ContainerUtil;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.*;
class ProfileViewer {
private class Ref {
private final String text;
private final String fileName;
private final int hashcode;
private int totalTime;
private final List<Occurrence> occurrences = new ArrayList<>();
Ref(String text, int hashcode, String filename) {
this.text = text;
this.hashcode = hashcode;
this.fileName = filename;
}
void addOccurrence(Occurrence o) {
occurrences.add(o);
totalTime += o.time;
}
@Override
public int hashCode() {
return hashcode;
}
@Override
public boolean equals(Object obj) {
return obj instanceof Ref && hashcode == ((Ref)obj).hashcode;
}
@Override
public String toString() {
return text+ " (" + totalTime + ")";
}
}
class Occurrence {
private Ref ref;
private int time;
private String type;
private final List<Occurrence> subOccurrences = new ArrayList<>();
void setData(String line) {
String[] split = line.split(" :: ");
assert split.length == 5: line;
try {
type = split[0];
String filename = split[1];
String text = split[2];
int hashcode = Integer.parseInt(split[3]);
time = Integer.parseInt(split[4]);
Ref ref = map.get(hashcode);
if (ref == null) {
ref = new Ref(text, hashcode, filename);
map.put(hashcode, ref);
}
this.ref = ref;
ref.addOccurrence(this);
}
catch (NumberFormatException e) {
throw new NumberFormatException(line);
}
}
Ref getRef() {
return ref;
}
int getTime() {
return time;
}
void addSubOccurrence(Occurrence o) {
subOccurrences.add(o);
}
@Override
public String toString() {
return time + " (" + (ref != null ? ref.text : null) + ")";
}
}
HashMap<Integer, Ref> map = new HashMap<>();
public static void main(String[] args) throws IOException {
new ProfileViewer().run();
}
void run() throws IOException {
List<String> list = new ArrayList<>();
File dir = new File("/users/maxmedvedev/work/resolve_info");
for (File file : dir.listFiles()) {
if (file.getName().endsWith(".txt")) {
try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
while (true) {
String line = reader.readLine();
if (line == null) break;
list.add(line);
}
}
}
}
Occurrence root = new Occurrence();
ArrayDeque<Occurrence> stack = new ArrayDeque<>();
stack.push(root);
int curSpaces = 0;
for (String line : list) {
int spaces = leadingSpaces(line);
if (curSpaces <= spaces) {
while (curSpaces < spaces) {
Occurrence occurrence = new Occurrence();
stack.peek().addSubOccurrence(occurrence);
stack.push(occurrence);
curSpaces += 2;
}
Occurrence occurrence = new Occurrence();
occurrence.setData(line.trim());
stack.peek().addSubOccurrence(occurrence);
} else {
stack.pop().setData(line);
curSpaces -= 2;
}
}
List<Ref> refs = new ArrayList<>(map.values());
ContainerUtil.sort(refs, (ref1, ref2) -> ref2.totalTime - ref1.totalTime);
int var = 1;
}
static int leadingSpaces(String s) {
int i = 0;
while (i < s.length() && s.charAt(i) == ' ') i++;
return i;
}
}

27
platform/platform-tests/testSrc/com/intellij/ide/codeStyleSettings/NewProjectSettingsTest.java
View File

@@ -1,26 +1,21 @@
// Copyright 2000-2019 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.ide.codeStyleSettings;
import com.intellij.application.options.CodeStyle;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.Map;
public class NewProjectSettingsTest extends CodeStyleTestCase {
private final static Map<String,Runnable> ourSetupMap = new HashMap<>();
static {
ourSetupMap.put("nonDefaultSettings", () -> {
CodeStyleSettingsManager manager = CodeStyleSettingsManager.getInstance();
manager.USE_PER_PROJECT_SETTINGS = true;
CodeStyleSettings testSettings = CodeStyle.createTestSettings();
manager.setMainProjectCodeStyle(testSettings);
testSettings.setDefaultRightMargin(77);
});
}
//private final static Map<String,Runnable> ourSetupMap = new HashMap<>();
//
//static {
// ourSetupMap.put("nonDefaultSettings", () -> {
// CodeStyleSettingsManager manager = CodeStyleSettingsManager.getInstance();
// manager.USE_PER_PROJECT_SETTINGS = true;
// CodeStyleSettings testSettings = CodeStyle.createTestSettings();
// manager.setMainProjectCodeStyle(testSettings);
// testSettings.setDefaultRightMargin(77);
// });
//}
@Override
public void setUp() throws Exception {

2
plugins/github/src/org/jetbrains/plugins/github/api/data/GithubGist.java
View File

@@ -11,7 +11,7 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
@SuppressWarnings("UnusedDeclaration")
@SuppressWarnings({"UnusedDeclaration", "MismatchedQueryAndUpdateOfCollection"})
public class GithubGist {
private String id;
private String description;

7
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/util/dynamicMembers/DynamicMemberUtils.java
View File

@@ -117,7 +117,6 @@ public final class DynamicMemberUtils {
private final Map<String, PsiField[]> myStaticFieldMap;
private final Map<String, PsiMethod[]> myNonStaticMethodMap;
private final Map<String, PsiField[]> myNonStaticFieldMap;
private ClassMemberHolder(Project project, String classSource) {
myClassSource = classSource;
@@ -131,7 +130,6 @@ public final class DynamicMemberUtils {
// Collect fields.
myFieldMap = new HashMap<>();
myStaticFieldMap = new HashMap<>();
myNonStaticFieldMap = new HashMap<>();
GrField[] fields = myClass.getCodeFields();
@@ -153,9 +151,6 @@ public final class DynamicMemberUtils {
if (field.hasModifierProperty(PsiModifier.STATIC)) {
myStaticFieldMap.put(field.getName(), dynamicFieldArray);
}
else {
myNonStaticFieldMap.put(field.getName(), dynamicFieldArray);
}
Object oldValue = myFieldMap.put(field.getName(), dynamicFieldArray);
assert oldValue == null : "Duplicated field in dynamic class: " + myClass.getName() + ":" + field.getName();
@@ -165,7 +160,7 @@ public final class DynamicMemberUtils {
myFieldMap.put(null, allFields);
// Collect methods..
// Collect methods
checkDuplicatedMethods(myClass);
MultiMap<String, PsiMethod> multiMap = new MultiMap<>();

2
plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/model/YouTrackIssue.java
View File

@@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
/**
* @noinspection unused
* @noinspection unused, MismatchedQueryAndUpdateOfCollection
*/
public class YouTrackIssue {
public static final String DEFAULT_FIELDS = "idReadable,updated,created,resolved,summary,description,customFields(name,value(name))";