coc-sonarlint 0.0.6 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/lib/index.js +155 -57
  2. package/package.json +1 -1
package/lib/index.js CHANGED
@@ -27444,7 +27444,7 @@ var src_exports = {};
27444
27444
  __export(src_exports, {
27445
27445
  activate: () => activate,
27446
27446
  deactivate: () => deactivate,
27447
- prepareRulesTreeView: () => prepareRulesTreeView,
27447
+ showRulesView: () => showRulesView,
27448
27448
  toUrl: () => toUrl
27449
27449
  });
27450
27450
  module.exports = __toCommonJS(src_exports);
@@ -28611,6 +28611,31 @@ var SonarLintExtendedLanguageClient = class extends coc7.LanguageClient {
28611
28611
 
28612
28612
  // src/rules/rules.ts
28613
28613
  var coc8 = __toESM(require("coc.nvim"));
28614
+
28615
+ // src/util/webview.ts
28616
+ var entityMap = {
28617
+ "&": "&",
28618
+ "<": "&lt;",
28619
+ ">": "&gt;",
28620
+ '"': "&quot;",
28621
+ "'": "&#39;",
28622
+ "/": "&#x2F;",
28623
+ "`": "&#x60;",
28624
+ "=": "&#x3D;"
28625
+ };
28626
+ function escapeHtml(str) {
28627
+ return String(str).replace(/[&<>"'/`=]/g, function(s) {
28628
+ return entityMap[s];
28629
+ });
28630
+ }
28631
+ function clean(str) {
28632
+ return capitalizeName(String(str).toLowerCase().split("_").join(" "));
28633
+ }
28634
+ function capitalizeName(name) {
28635
+ return String(name).replace(/\b(\w)/g, (s) => s.toUpperCase());
28636
+ }
28637
+
28638
+ // src/rules/rules.ts
28614
28639
  function isActive(rule) {
28615
28640
  return rule.activeByDefault && rule.levelFromConfig !== "off" || rule.levelFromConfig === "on";
28616
28641
  }
@@ -28620,7 +28645,8 @@ function actualLevel(rule) {
28620
28645
  var LanguageNode = class extends coc8.TreeItem {
28621
28646
  constructor(label, state) {
28622
28647
  super(label, state);
28623
- this.id = label.toLowerCase();
28648
+ this.id = userNormalizedLanguageKey(label);
28649
+ this.id = this.id.toLowerCase();
28624
28650
  this.tooltip = `Rules applicable for ${label} language`;
28625
28651
  }
28626
28652
  };
@@ -28630,6 +28656,8 @@ var RuleNode = class extends coc8.TreeItem {
28630
28656
  this.rule = rule;
28631
28657
  this.language = language;
28632
28658
  this.id = rule.key.toLowerCase();
28659
+ this.language = userNormalizedLanguageKey(this.language);
28660
+ this.language = this.language.toLowerCase();
28633
28661
  this.tooltip = `Toggle rule ${rule.key} status`;
28634
28662
  this.description = `${rule.key} - ${actualLevel(rule)}`;
28635
28663
  this.command = {
@@ -28649,9 +28677,9 @@ var AllRulesTreeDataProvider = class {
28649
28677
  this.allChildren = /* @__PURE__ */ new Map();
28650
28678
  }
28651
28679
  async getTreeItem(node) {
28652
- if (node instanceof RuleNode && node.id && this.allChildren.has(node.id)) {
28653
- return this.allChildren.get(node.id)?.find((n) => n.id == node.id);
28654
- } else if (node instanceof LanguageNode && this.allRoots.length > 0) {
28680
+ if (node instanceof RuleNode && node.language && this.allChildren.has(node.language)) {
28681
+ return this.allChildren.get(node.language)?.find((n) => n.id == node.id);
28682
+ } else if (node instanceof LanguageNode && node.id && this.allRoots.length > 0) {
28655
28683
  return this.allRoots?.find((n) => n.id == node.id);
28656
28684
  } else {
28657
28685
  return node;
@@ -28682,7 +28710,7 @@ var AllRulesTreeDataProvider = class {
28682
28710
  const localRuleConfig = coc8.workspace.getConfiguration("sonarlint.rules");
28683
28711
  result = await this.getAllRules().then((response) => {
28684
28712
  if (node) {
28685
- return response[node.label].sort(byName).map((rule) => {
28713
+ return response[userNormalizedLanguageKey(node.label)].sort(byName).map((rule) => {
28686
28714
  rule.levelFromConfig = localRuleConfig.get(rule.key, {})["level"];
28687
28715
  return rule;
28688
28716
  }).filter((r) => {
@@ -28793,6 +28821,86 @@ function toggleRule(level) {
28793
28821
  }
28794
28822
  };
28795
28823
  }
28824
+ function userNormalizedLanguageKey(sonarLanguageKey) {
28825
+ switch (sonarLanguageKey) {
28826
+ case "markdown":
28827
+ return "Secrets";
28828
+ case "css":
28829
+ case "scss":
28830
+ case "Css":
28831
+ case "Scss":
28832
+ return "CSS";
28833
+ case "htm":
28834
+ case "htmx":
28835
+ case "html":
28836
+ case "Html":
28837
+ return "HTML";
28838
+ case "js":
28839
+ case "javascript":
28840
+ return "JavaScript";
28841
+ case "ts":
28842
+ case "typescript":
28843
+ return "TypeScript";
28844
+ case "py":
28845
+ case "python":
28846
+ return "Python";
28847
+ case "ipy":
28848
+ case "ipynb":
28849
+ case "ipython":
28850
+ return "IPython Notebooks";
28851
+ case "arm":
28852
+ case "azure":
28853
+ case "azureresmgr":
28854
+ case "azureresource":
28855
+ case "azureresourcemanager":
28856
+ return "AzureResourceManager";
28857
+ case "cpp":
28858
+ case "cplus":
28859
+ case "cplusplus":
28860
+ return "C++";
28861
+ case "k8s":
28862
+ case "yml":
28863
+ case "yaml":
28864
+ return "Kubernetes";
28865
+ default:
28866
+ return capitalizeName(sonarLanguageKey);
28867
+ }
28868
+ }
28869
+ function languageKeyDeNormalization(sonarLanguageKey) {
28870
+ switch (sonarLanguageKey) {
28871
+ case "c++":
28872
+ case "C++":
28873
+ case "cplus":
28874
+ case "cplusplus":
28875
+ return "cpp";
28876
+ case "scss":
28877
+ case "Scss":
28878
+ return "css";
28879
+ case "htm":
28880
+ case "htmx":
28881
+ return "HTML";
28882
+ case "js":
28883
+ return "JavaScript";
28884
+ case "ts":
28885
+ return "TypeScript";
28886
+ case "py":
28887
+ return "Python";
28888
+ case "ipy":
28889
+ case "ipynb":
28890
+ return "ipython";
28891
+ case "arm":
28892
+ case "azure":
28893
+ case "azureresmgr":
28894
+ case "azureresource":
28895
+ return "azureresourcemanager";
28896
+ case "k8s":
28897
+ case "yml":
28898
+ case "yaml":
28899
+ return "kubernetes";
28900
+ default:
28901
+ return sonarLanguageKey.toLowerCase();
28902
+ }
28903
+ }
28796
28904
 
28797
28905
  // node_modules/compare-versions/index.mjs
28798
28906
  function compareVersions(v1, v2) {
@@ -29019,29 +29127,6 @@ function getJavaExtension() {
29019
29127
  var coc10 = __toESM(require("coc.nvim"));
29020
29128
  var md = __toESM(require_dist3());
29021
29129
 
29022
- // src/util/webview.ts
29023
- var entityMap = {
29024
- "&": "&amp;",
29025
- "<": "&lt;",
29026
- ">": "&gt;",
29027
- '"': "&quot;",
29028
- "'": "&#39;",
29029
- "/": "&#x2F;",
29030
- "`": "&#x60;",
29031
- "=": "&#x3D;"
29032
- };
29033
- function escapeHtml(str) {
29034
- return String(str).replace(/[&<>"'/`=]/g, function(s) {
29035
- return entityMap[s];
29036
- });
29037
- }
29038
- function clean(str) {
29039
- return capitalizeName(String(str).toLowerCase().split("_").join(" "));
29040
- }
29041
- function capitalizeName(name) {
29042
- return String(name).replace(/\b(\w)/g, (s) => s.toUpperCase());
29043
- }
29044
-
29045
29130
  // src/rules/syntax-highlight.ts
29046
29131
  var import_node_html_parser = __toESM(require_dist2());
29047
29132
  function getNonDiffCodeSnippetsToHighlight(doc) {
@@ -29460,6 +29545,17 @@ async function activate(context) {
29460
29545
  () => languageClient.listAllRules(),
29461
29546
  /* @__PURE__ */ new Map()
29462
29547
  );
29548
+ allRulesView = coc12.window.createTreeView("Sonarlint rules", {
29549
+ bufhidden: "hide",
29550
+ treeDataProvider: allRulesTreeDataProvider
29551
+ });
29552
+ allRulesView.onDidCollapseElement((n) => {
29553
+ allRulesTreeDataProvider.register(n.element);
29554
+ });
29555
+ allRulesView.onDidExpandElement((n) => {
29556
+ allRulesTreeDataProvider.register(n.element);
29557
+ });
29558
+ context.subscriptions.push(allRulesView);
29463
29559
  floatDescriptionFactory = import_coc2.window.createFloatFactory({
29464
29560
  preferTop: true,
29465
29561
  autoHide: true,
@@ -29499,31 +29595,50 @@ function registerCommands(context) {
29499
29595
  context.subscriptions.push(
29500
29596
  coc12.commands.registerCommand(Commands.SHOW_ALL_RULES, async () => {
29501
29597
  allRulesTreeDataProvider.filter();
29502
- await prepareRulesTreeView("Displaying all rules");
29598
+ await showRulesView("Sonarlint all rules");
29503
29599
  })
29504
29600
  );
29505
29601
  context.subscriptions.push(
29506
29602
  coc12.commands.registerCommand(Commands.SHOW_ACTIVE_RULES, async () => {
29507
29603
  allRulesTreeDataProvider.filter("on");
29508
- await prepareRulesTreeView("Displaying active rules");
29604
+ await showRulesView("Sonarlint active rules");
29509
29605
  })
29510
29606
  );
29511
29607
  context.subscriptions.push(
29512
29608
  coc12.commands.registerCommand(Commands.SHOW_INACTIVE_RULES, async () => {
29513
29609
  allRulesTreeDataProvider.filter("off");
29514
- await prepareRulesTreeView("Displaying inactive rules");
29610
+ await showRulesView("Sonarlint inactive rules");
29515
29611
  })
29516
29612
  );
29517
29613
  context.subscriptions.push(
29518
29614
  coc12.commands.registerCommand(
29519
29615
  Commands.OPEN_RULE_BY_KEY,
29520
29616
  async (ruleKey) => {
29521
- await prepareRulesTreeView(`Displaying rules for ${ruleKey}`);
29522
- const type = ruleKey.indexOf(":") >= 0 ? new RuleNode({ key: ruleKey.toLowerCase() }) : new LanguageNode(ruleKey.toLowerCase(), coc12.TreeItemCollapsibleState.Collapsed);
29523
- const node = await allRulesTreeDataProvider.getTreeItem(type);
29524
- node.collapsibleState = coc12.TreeItemCollapsibleState.Expanded;
29525
- allRulesTreeDataProvider.register(node);
29526
- await allRulesView?.reveal(node, { select: true, focus: true, expand: true });
29617
+ if (!ruleKey || ruleKey.length == 0) {
29618
+ coc12.window.showWarningMessage(`Provided rule key was emtpy or was invalid`);
29619
+ return;
29620
+ }
29621
+ allRulesTreeDataProvider.filter();
29622
+ await showRulesView(`Sonarlint rules for rule ${ruleKey}`);
29623
+ const indexOfSeparator = ruleKey.indexOf(":");
29624
+ const language = indexOfSeparator > 0 ? ruleKey.substring(0, indexOfSeparator) : null;
29625
+ const type = indexOfSeparator > 0 && language ? new RuleNode({ key: languageKeyDeNormalization(language) + ":" + ruleKey.substring(indexOfSeparator + 1).toLowerCase() }, language) : new LanguageNode(ruleKey, coc12.TreeItemCollapsibleState.Collapsed);
29626
+ let node = await allRulesTreeDataProvider.getTreeItem(type);
29627
+ if (type instanceof RuleNode && language) {
29628
+ const pnode = new LanguageNode(language.toLowerCase(), coc12.TreeItemCollapsibleState.Expanded);
29629
+ allRulesTreeDataProvider.register(pnode);
29630
+ if (node === type) {
29631
+ await allRulesTreeDataProvider.getChildren(pnode);
29632
+ node = await allRulesTreeDataProvider.getTreeItem(type);
29633
+ }
29634
+ await allRulesView?.reveal(node, { select: true, focus: true, expand: true });
29635
+ } else if (type instanceof LanguageNode) {
29636
+ node.collapsibleState = coc12.TreeItemCollapsibleState.Expanded;
29637
+ allRulesTreeDataProvider.register(node);
29638
+ await allRulesView?.reveal(node, { select: true, focus: true, expand: true });
29639
+ } else {
29640
+ coc12.window.showWarningMessage(`Unable to find or resolve rule id ${ruleKey}`);
29641
+ }
29527
29642
  }
29528
29643
  )
29529
29644
  );
@@ -29653,24 +29768,7 @@ function deactivate() {
29653
29768
  }
29654
29769
  return languageClient.stop();
29655
29770
  }
29656
- async function prepareRulesTreeView(title) {
29657
- if (!allRulesView) {
29658
- allRulesView = coc12.window.createTreeView(title, {
29659
- treeDataProvider: allRulesTreeDataProvider
29660
- });
29661
- allRulesView.onDidCollapseElement((n) => {
29662
- allRulesTreeDataProvider.register(n.element);
29663
- });
29664
- allRulesView.onDidExpandElement((n) => {
29665
- allRulesTreeDataProvider.register(n.element);
29666
- });
29667
- allRulesView.onDidChangeVisibility((e) => {
29668
- if (!e.visible) {
29669
- allRulesView?.dispose();
29670
- allRulesView = void 0;
29671
- }
29672
- });
29673
- }
29771
+ async function showRulesView(title) {
29674
29772
  allRulesView.title = title;
29675
29773
  if (!allRulesView.visible) {
29676
29774
  await allRulesView?.show();
@@ -29697,7 +29795,7 @@ function toUrl(filePath) {
29697
29795
  0 && (module.exports = {
29698
29796
  activate,
29699
29797
  deactivate,
29700
- prepareRulesTreeView,
29798
+ showRulesView,
29701
29799
  toUrl
29702
29800
  });
29703
29801
  /*! https://mths.be/he v1.2.0 by @mathias | MIT license */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "coc-sonarlint",
3
- "version": "0.0.6",
3
+ "version": "0.0.7",
4
4
  "description": "sonarlint for coc.nvim",
5
5
  "author": "asmodeus812 <svetlozar321@gmail.com>",
6
6
  "license": "MIT",