Add other config implementation

Author: Sigmanificient

src/ecsls/config.py

@@ -32,7 +32,16 @@ def set_opts(self, opts: LSPAny, ls: LanguageServer):
 
     def _read_conf(self, confpath):
         with open(confpath, "rb") as f:
-            self.__conf = tomli.load(f)
+            self.__conf = tomli.load(f).get("reports", {
+                "ignore": [],
+                "severity_levels": True,
+                "merge": "multiline",
+                "text": {
+                    "level": False,
+                    "code": True,
+                    "description": True
+                }
+            })
 
     def read(self, filepath):
         path = Path(filepath)
@@ -43,5 +52,13 @@ def read(self, filepath):
 
             path = path.parent
 
-    def get(self, key, default):
-        return self.__conf.get(key, default)
+    def get(self, key, typ, default):
+        v = self.__conf.get(key)
+
+        if v is None:
+            return default
+
+        if not isinstance(v, typ):
+            return default
+
+        return v

src/ecsls/server.py

@@ -24,10 +24,15 @@
 
 
 class LineRange(Range):
+
     def __init__(self, line: int, last_line: int = 0):
+        conf = Config.instance()
+        is_multiline = conf.get("merge", str, "multiline") != "multiplier"
+        end = last_line if last_line and is_multiline else (line - 1)
+
         super().__init__(
             start=Position(line - 1, 1),
-            end=Position(last_line or (line - 1), 80)
+            end=Position(end, 80)
         )
 
 
@@ -37,23 +42,24 @@ def __init__(self, line: int, last_line: int = 0):
     ReportType.INFO: DiagnosticSeverity.Hint
 }
 
-def _merge_cf4s(reports: List[Report]) -> List[Report]:
+def _merge_reports(reports: List[Report]) -> List[Report]:
     out_reports = []
-    cf4s: Dict[int, Report] = {}
-
-    for report in sorted(reports, key=lambda r: r.line):
-        if report.rule != 'C-F4':
-            out_reports.append(report)
-            continue
-
-        for k in cf4s.values():
-            if k.is_mergeable(report.line):
-               k.merge(report)
-               break
-        else:
-            cf4s[report.line] = report
-
-    out_reports.extend(cf4s.values())
+   
+    for rule in set(report.rule for report in reports):
+        m = {}
+
+        for report in sorted(reports, key=lambda r: r.line):
+            if report.rule != rule:
+                continue
+
+            for k in m.values():
+                if k.is_mergeable(report.line):
+                    k.merge(report)
+                    break
+            else:
+                m[report.line] = report
+
+        out_reports.extend(m.values())
     return out_reports
 
 
@@ -72,13 +78,19 @@ def get_diagnostics(text_doc: Document):
 
     return [
         Diagnostic(
-            range=LineRange(report.line, report.last_line),
+            range=LineRange(
+                report.line,
+                report.last_line
+            ),
             message=report.message,
             source="Json Server",
-            severity=SEVERITIES[report.type],
-        )
-        for report in _merge_cf4s(reports)
-        if report.rule not in conf.get("ignore", [])
+            severity=(
+                SEVERITIES[report.type]
+                if conf.get("severity_levels", bool, True)
+                else DiagnosticSeverity.Hint
+            )
+        ) for report in _merge_reports(reports)
+        if report.rule not in conf.get("ignore", list, [])
     ]
 
 @server.feature(INITIALIZE)

src/ecsls/vera.py

@@ -52,17 +52,30 @@ def from_string(cls, line: str) -> Optional[Report]:
             return None
 
         line, typ, rule = match.groups()
-
         return cls(line=int(line), type=ReportType(typ), rule=rule)
 
     @property
     def message(self) -> str:
         msg = populate_descriptions()
-        desc = str(msg.get(self.rule))
 
-        times = f" x{self.count}" * (self.count > 1)
-        return f"{self.rule}: {desc}" + times
+        conf = Config.instance()
+        text = conf.get("text", dict, {})
+
+        desc_members = []
 
+        if text.get("level", False):
+            desc_members.append(str(self.type))
+        if text.get("code", True):
+            desc_members.append(self.rule)
+        if text.get("description", True):
+            desc_members.append(str(msg.get(self.rule)))
+
+        desc = ':'.join(desc_members)
+        if conf.get("merge", str, "multiline") != "multiplier":
+            return desc
+
+        times = f" x{self.count}" * (self.count > 1)
+        return desc + times
 
 def populate_descriptions():
     descriptions = {}