@usethesource/rascal-vscode-dsl-lsp-server 0.6.1 → 0.6.3

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.
Binary file
@@ -83,12 +83,14 @@ class RascalMFValidator {
83
83
  }
84
84
  async verifyRascalMF(file) {
85
85
  try {
86
- const mfBody = await vscode.workspace.openTextDocument(file);
87
- const diagnostics = [];
88
- checkMissingLastLine(mfBody, diagnostics);
89
- checkIncorrectProjectName(mfBody, diagnostics);
90
- checkCommonTypo(mfBody, diagnostics);
91
- this.diagnostics.set(file, diagnostics);
86
+ if (!/\/target\/classes\//.test(file.path)) {
87
+ const mfBody = await vscode.workspace.openTextDocument(file);
88
+ const diagnostics = [];
89
+ checkMissingLastLine(mfBody, diagnostics);
90
+ checkIncorrectProjectName(mfBody, diagnostics);
91
+ checkCommonTypo(mfBody, diagnostics);
92
+ this.diagnostics.set(file, diagnostics);
93
+ }
92
94
  }
93
95
  catch (error) {
94
96
  }
@@ -97,15 +99,15 @@ class RascalMFValidator {
97
99
  exports.RascalMFValidator = RascalMFValidator;
98
100
  var FixKind;
99
101
  (function (FixKind) {
100
- FixKind[FixKind["ADD_NEW_LINE"] = 1] = "ADD_NEW_LINE";
101
- FixKind[FixKind["FIX_PROJECT_NAME"] = 2] = "FIX_PROJECT_NAME";
102
- FixKind[FixKind["REQUIRE_LIBRARIES_TYPO"] = 3] = "REQUIRE_LIBRARIES_TYPO";
102
+ FixKind[FixKind["addNewLine"] = 1] = "addNewLine";
103
+ FixKind[FixKind["fixProjectName"] = 2] = "fixProjectName";
104
+ FixKind[FixKind["requireLibrariesTypo"] = 3] = "requireLibrariesTypo";
103
105
  })(FixKind || (FixKind = {}));
104
106
  function checkMissingLastLine(mfBody, diagnostics) {
105
107
  const lastLine = mfBody.lineAt(mfBody.lineCount - 1);
106
108
  if (lastLine.text !== "") {
107
109
  const diag = new vscode.Diagnostic(lastLine.range, `${MF_FILE} should end with a empty newline (no spaces, no comments), else the previous line is ignored`, vscode.DiagnosticSeverity.Error);
108
- diag.code = FixKind.ADD_NEW_LINE;
110
+ diag.code = FixKind.addNewLine;
109
111
  diagnostics.push(diag);
110
112
  }
111
113
  }
@@ -122,7 +124,7 @@ function checkIncorrectProjectName(mfBody, diagnostics) {
122
124
  const offset = line.text.indexOf(prName);
123
125
  const targetRange = new vscode.Range(l, offset, l, offset + prName.length);
124
126
  const diag = new vscode.Diagnostic(targetRange, `Incorrect project-name, it should equal the directory name (${expectedName})`, vscode.DiagnosticSeverity.Error);
125
- diag.code = FixKind.FIX_PROJECT_NAME;
127
+ diag.code = FixKind.fixProjectName;
126
128
  diagnostics.push(diag);
127
129
  }
128
130
  }
@@ -131,29 +133,18 @@ function checkIncorrectProjectName(mfBody, diagnostics) {
131
133
  diagnostics.push(new vscode.Diagnostic(new vscode.Range(0, 0, 0, 0), "Missing project name, please add a 'Project-Name' property"));
132
134
  }
133
135
  }
136
+ const commonTypos = new Set(['required-libraries', 'require-library', 'required-library']);
134
137
  function checkCommonTypo(mfBody, diagnostics) {
135
138
  for (let l = 0; l < mfBody.lineCount; l++) {
136
139
  const line = mfBody.lineAt(l);
137
140
  const kvPair = line.text.split(":");
138
141
  if (kvPair.length >= 2) {
139
- let fixType = undefined;
140
- switch (kvPair[0].trim()) {
141
- case "Required-Libraries":
142
- fixType = FixKind.REQUIRE_LIBRARIES_TYPO;
143
- break;
144
- case "Require-Library":
145
- fixType = FixKind.REQUIRE_LIBRARIES_TYPO;
146
- break;
147
- case "Required-Library":
148
- fixType = FixKind.REQUIRE_LIBRARIES_TYPO;
149
- break;
150
- }
151
- switch (fixType) {
152
- case FixKind.REQUIRE_LIBRARIES_TYPO:
153
- const originalLabel = kvPair[0];
154
- const diag = new vscode.Diagnostic(new vscode.Range(l, 0, l, originalLabel.length), `"${originalLabel} should be Require-Libraries`);
155
- diag.code = FixKind.REQUIRE_LIBRARIES_TYPO;
156
- diagnostics.push(diag);
142
+ const key = kvPair[0].trim();
143
+ if (commonTypos.has(key.toLocaleLowerCase())) {
144
+ const originalLabel = kvPair[0];
145
+ const diag = new vscode.Diagnostic(new vscode.Range(l, 0, l, originalLabel.length), `"${originalLabel} should be Require-Libraries`);
146
+ diag.code = FixKind.requireLibrariesTypo;
147
+ diagnostics.push(diag);
157
148
  }
158
149
  }
159
150
  }
@@ -171,7 +162,7 @@ class FixMFErrors {
171
162
  const result = [];
172
163
  for (const diag of context.diagnostics) {
173
164
  switch (diag.code) {
174
- case FixKind.ADD_NEW_LINE:
165
+ case FixKind.addNewLine:
175
166
  const addNewline = new vscode.CodeAction("Add newline", vscode.CodeActionKind.QuickFix);
176
167
  addNewline.diagnostics = [diag];
177
168
  addNewline.isPreferred = true;
@@ -180,7 +171,7 @@ class FixMFErrors {
180
171
  addNewline.edit.insert(document.uri, lastLine.rangeIncludingLineBreak.end, (document.eol === vscode.EndOfLine.CRLF ? "\r\n" : "\n"));
181
172
  result.push(addNewline);
182
173
  break;
183
- case FixKind.FIX_PROJECT_NAME:
174
+ case FixKind.fixProjectName:
184
175
  const fixedProjectName = new vscode.CodeAction("Fix project-name", vscode.CodeActionKind.QuickFix);
185
176
  fixedProjectName.diagnostics = [diag];
186
177
  fixedProjectName.isPreferred = true;
@@ -188,7 +179,7 @@ class FixMFErrors {
188
179
  fixedProjectName.edit.replace(document.uri, diag.range, calculateProjectName(document.uri));
189
180
  result.push(fixedProjectName);
190
181
  break;
191
- case FixKind.REQUIRE_LIBRARIES_TYPO:
182
+ case FixKind.requireLibrariesTypo:
192
183
  const typo = new vscode.CodeAction("Fix typo", vscode.CodeActionKind.QuickFix);
193
184
  typo.diagnostics = [diag];
194
185
  typo.isPreferred = true;
@@ -1 +1 @@
1
- {"version":3,"file":"RascalMFValidator.js","sourceRoot":"","sources":["../../src/ux/RascalMFValidator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RascalMFValidator.js","sourceRoot":"","sources":["../../src/ux/RascalMFValidator.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -9,7 +9,7 @@
9
9
  "parsing",
10
10
  "source code analysis"
11
11
  ],
12
- "version": "0.6.1",
12
+ "version": "0.6.3",
13
13
  "engines": {
14
14
  "vscode": "^1.67.0"
15
15
  },