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

live template FUS: add plugin info, include only bundled templates, anonymize other templates (IDEA-CR-42283, FUS-179)

Browse Source
This commit is contained in:
peter
2019-01-31 16:20:58 +01:00
parent f584af6c7e
commit b441366571
2 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateRunLogger.java
+22 -5
View File
@@ -3,7 +3,9 @@ package com.intellij.codeInsight.template.impl;
import com.intellij.internal.statistic.eventLog.FeatureUsageData;
import com.intellij.internal.statistic.service.fus.collectors.FUCounterUsageLogger;
import com.intellij.internal.statistic.utils.PluginInfo;
import com.intellij.lang.Language;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
class LiveTemplateRunLogger {
@@ -12,11 +14,26 @@ class LiveTemplateRunLogger {
static void log(@NotNull TemplateImpl template, @NotNull Language language) {
String key = template.getKey();
String groupName = template.getGroupName();
if (TemplateSettings.getInstance().isStatisticsSafeTemplate(key, groupName)) {
final FeatureUsageData data = new FeatureUsageData().
addLanguage(language).
addData("group", groupName);
FUCounterUsageLogger.getInstance().logEvent(GROUP, key, data);
if (isCreatedProgrammatically(key, groupName)) return;
PluginInfo plugin = TemplateSettings.getInstance().findPluginForPredefinedTemplate(template);
if (plugin == null) {
key = "user.defined.template";
groupName = "user.defined.group";
}
else if (!plugin.isSafeToReport()) {
key = "custom.plugin.template";
groupName = "custom.plugin.group";
}
FeatureUsageData data = new FeatureUsageData().addLanguage(language).addData("group", groupName);
if (plugin != null) {
data.addPluginInfo(plugin);
}
FUCounterUsageLogger.getInstance().logEvent(GROUP, key, data);
}
private static boolean isCreatedProgrammatically(String key, String groupName) {
return StringUtil.isEmpty(key) || StringUtil.isEmpty(groupName);
}
}
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
+36 -20
View File
@@ -4,6 +4,7 @@ package com.intellij.codeInsight.template.impl;
import com.intellij.AbstractBundle;
import com.intellij.codeInsight.template.Template;
import com.intellij.codeInsight.template.TemplateContextType;
import com.intellij.internal.statistic.utils.PluginInfo;
import com.intellij.internal.statistic.utils.PluginInfoDetectorKt;
import com.intellij.openapi.application.ex.DecodeDefaultsUtil;
import com.intellij.openapi.components.PersistentStateComponent;
@@ -94,7 +95,7 @@ public class TemplateSettings implements PersistentStateComponent<TemplateSettin
private final SchemeManager<TemplateGroup> mySchemeManager;
private State myState = new State();
private final Set<Pair<String, String>> myStatisticsSafeTemplates = new HashSet<>();
private final Map<Pair<String, String>, PluginInfo> myPredefinedTemplates = new HashMap<>();
static final class ShortcutConverter extends Converter<Character> {
@NotNull
@@ -185,7 +186,8 @@ public class TemplateSettings implements PersistentStateComponent<TemplateSettin
@Nullable
@Override
public TemplateGroup readScheme(@NotNull Element element, boolean duringLoad) {
TemplateGroup group = readTemplateFile(element, element.getAttributeValue("group"), false, false, getClass().getClassLoader());
TemplateGroup readGroup = parseTemplateGroup(element, element.getAttributeValue("group"), getClass().getClassLoader());
TemplateGroup group = readGroup == null ? null : mergeParsedGroup(element, false, false, readGroup);
if (group != null) {
group.setModified(false);
}
@@ -485,26 +487,31 @@ public class TemplateSettings implements PersistentStateComponent<TemplateSettin
private void readDefTemplate(@NotNull DefaultLiveTemplatesProvider provider, @NotNull String defTemplate, boolean registerTemplate) throws JDOMException, InvalidDataException, IOException {
InputStream inputStream = DecodeDefaultsUtil.getDefaultsInputStream(provider, defTemplate);
if (inputStream != null) {
TemplateGroup group = readTemplateFile(JDOMUtil.load(inputStream), getDefaultTemplateName(defTemplate), true, registerTemplate, provider.getClass().getClassLoader());
if (group != null) {
if (group.getReplace() != null) {
for (TemplateImpl template : myTemplates.get(group.getReplace())) {
removeTemplate(template);
Element element = JDOMUtil.load(inputStream);
TemplateGroup defGroup = parseTemplateGroup(element, getDefaultTemplateName(defTemplate), provider.getClass().getClassLoader());
if (defGroup != null) {
PluginInfo info = PluginInfoDetectorKt.getPluginInfo(provider.getClass());
for (TemplateImpl template : defGroup.getElements()) {
String key = template.getKey();
String groupName = template.getGroupName();
if (StringUtil.isNotEmpty(key) && StringUtil.isNotEmpty(groupName)) {
myPredefinedTemplates.put(Pair.create(key, groupName), info);
}
}
if (PluginInfoDetectorKt.getPluginInfo(provider.getClass()).isSafeToReport()) {
for (TemplateImpl template : group.getElements()) {
myStatisticsSafeTemplates.add(Pair.create(template.getKey(), template.getGroupName()));
TemplateGroup group = mergeParsedGroup(element, true, registerTemplate, defGroup);
if (group != null && group.getReplace() != null) {
for (TemplateImpl template : myTemplates.get(group.getReplace())) {
removeTemplate(template);
}
}
}
}
}
public boolean isStatisticsSafeTemplate(String key, String groupName) {
return StringUtil.isNotEmpty(key) &&
StringUtil.isNotEmpty(groupName) &&
myStatisticsSafeTemplates.contains(Pair.create(key, groupName));
@Nullable
public PluginInfo findPluginForPredefinedTemplate(TemplateImpl template) {
return myPredefinedTemplates.get(Pair.create(template.getKey(), template.getGroupName()));
}
private static String getDefaultTemplateName(String defTemplate) {
@@ -512,7 +519,7 @@ public class TemplateSettings implements PersistentStateComponent<TemplateSettin
}
@Nullable
private TemplateGroup readTemplateFile(@NotNull Element element, @NonNls String defGroupName, boolean isDefault, boolean registerTemplate, @NotNull ClassLoader classLoader) {
private static TemplateGroup parseTemplateGroup(@NotNull Element element, @NonNls String defGroupName, @NotNull ClassLoader classLoader) {
if (!TEMPLATE_SET.equals(element.getName())) {
LOG.error("Ignore invalid template scheme: " + JDOMUtil.writeElement(element));
return null;
@@ -525,18 +532,27 @@ public class TemplateSettings implements PersistentStateComponent<TemplateSettin
TemplateGroup result = new TemplateGroup(groupName, element.getAttributeValue("REPLACE"));
Map<String, TemplateImpl> created = new LinkedHashMap<>();
for (Element child : element.getChildren(TEMPLATE)) {
TemplateImpl template;
try {
template = readTemplateFromElement(groupName, child, classLoader);
result.addElement(readTemplateFromElement(groupName, child, classLoader));
}
catch (Exception e) {
LOG.warn("failed to load template " + element.getAttributeValue(NAME), e);
continue;
}
}
return result;
}
@Nullable
private TemplateGroup mergeParsedGroup(@NotNull Element element,
boolean isDefault,
boolean registerTemplate,
TemplateGroup parsedGroup) {
TemplateGroup result = new TemplateGroup(parsedGroup.getName(), element.getAttributeValue("REPLACE"));
Map<String, TemplateImpl> created = new LinkedHashMap<>();
for (TemplateImpl template : parsedGroup.getElements()) {
if (isDefault) {
myDefaultTemplates.put(TemplateKey.keyOf(template), template);
}