Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix custom rules - second try #1346

Merged
merged 1 commit into from
Nov 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions sonar-c-plugin/src/main/java/org/sonar/plugins/c/CPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.sonar.api.platform.ServerFileSystem;
import org.sonar.api.resources.Qualifiers;
import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
import org.sonar.cxx.CxxLanguage;
import org.sonar.cxx.sensors.clangtidy.CxxClangTidyRuleRepository;
import org.sonar.cxx.sensors.clangtidy.CxxClangTidySensor;
import org.sonar.cxx.sensors.clangsa.CxxClangSARuleRepository;
Expand Down Expand Up @@ -616,11 +615,11 @@ public CxxSquidSensorImpl(Configuration settings,
super(new CLanguage(settings), fileLinesContextFactory, checkFactory);
}

public CxxSquidSensorImpl(CxxLanguage language,
public CxxSquidSensorImpl(Configuration settings,
FileLinesContextFactory fileLinesContextFactory,
CheckFactory checkFactory,
@Nullable CustomCxxRulesDefinition[] customRulesDefinition) {
super(language, fileLinesContextFactory, checkFactory, customRulesDefinition);
super(new CLanguage(settings), fileLinesContextFactory, checkFactory, customRulesDefinition);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@

import com.google.common.collect.ImmutableList;
import javax.annotation.Nullable;
import org.sonar.cxx.CxxLanguage;
import org.sonar.cxx.sensors.squid.CustomCxxRulesDefinition;

/**
Expand Down Expand Up @@ -645,11 +644,11 @@ public CxxSquidSensorImpl(Configuration settings,
super(new CppLanguage(settings), fileLinesContextFactory, checkFactory);
}

public CxxSquidSensorImpl(CxxLanguage language,
public CxxSquidSensorImpl(Configuration settings,
FileLinesContextFactory fileLinesContextFactory,
CheckFactory checkFactory,
@Nullable CustomCxxRulesDefinition[] customRulesDefinition) {
super(language, fileLinesContextFactory, checkFactory, customRulesDefinition);
super(new CppLanguage(settings), fileLinesContextFactory, checkFactory, customRulesDefinition);
}
}

Expand Down