build: update pretter to 2.x (#87)

Author: bd82

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.mocharc.js

@@ -1,4 +1,4 @@
 module.exports = {
   require: ["source-map-support/register"],
-  spec: "./lib/test/**/*spec.js"
+  spec: "./lib/test/**/*spec.js",
 };

nyc.config.js

@@ -6,5 +6,5 @@ module.exports = {
   branches: 100,
   lines: 100,
   functions: 100,
-  statements: 100
+  statements: 100,
 };

package.json

@@ -47,7 +47,7 @@
     "mocha": "7.1.2",
     "npm-run-all": "4.1.5",
     "nyc": "15.0.1",
-    "prettier": "1.19.1",
+    "prettier": "2.0.5",
     "source-map-support": "0.5.19",
     "typescript": "3.8.3",
     "cz-conventional-changelog": "3.1.0",
@@ -57,9 +57,6 @@
     "@types/rimraf": "3.0.0",
     "simple-git": "1.132.0"
   },
-  "prettier": {
-    "endOfLine": "lf"
-  },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged",

packages/language-server/src/completion-items.ts

@@ -5,7 +5,7 @@ import {
   TextDocumentPositionParams,
   InsertTextFormat,
   TextEdit,
-  Range
+  Range,
 } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { Position } from "vscode-languageserver-types";
@@ -16,25 +16,25 @@ import {
   SourcePosition,
   XMLAttribute,
   XMLElement,
-  XMLDocument
+  XMLDocument,
 } from "@xml-tools/ast";
 import {
   UI5SemanticModel,
   BaseUI5Node,
   UI5Prop,
   UI5Aggregation,
   UI5Association,
-  UI5Field
+  UI5Field,
 } from "@ui5-language-assistant/semantic-model-types";
 import {
   getXMLViewCompletions,
   UI5XMLViewCompletion,
-  UI5ClassesInXMLTagNameCompletion
+  UI5ClassesInXMLTagNameCompletion,
 } from "@ui5-language-assistant/xml-views-completion";
 import {
   ui5NodeToFQN,
   isRootSymbol,
-  typeToString
+  typeToString,
 } from "@ui5-language-assistant/logic-utils";
 import { getNodeDocumentation } from "./documentation";
 
@@ -51,7 +51,7 @@ export function getCompletionItems(
     offset: document.offsetAt(textDocumentPosition.position),
     cst: cst as DocumentCstNode,
     ast: ast,
-    tokenVector: tokenVector
+    tokenVector: tokenVector,
   });
 
   const completionItems = transformToLspSuggestions(
@@ -67,7 +67,7 @@ function transformToLspSuggestions(
   model: UI5SemanticModel,
   originalPosition: Position
 ): CompletionItem[] {
-  const lspSuggestions = map(suggestions, suggestion => {
+  const lspSuggestions = map(suggestions, (suggestion) => {
     const lspKind = computeLSPKind(suggestion);
     let detailText = getNodeDetail(suggestion.ui5Node);
     if (suggestion.ui5Node.experimentalInfo?.isExperimental) {
@@ -86,7 +86,7 @@ function transformToLspSuggestions(
       additionalTextEdits: textEditDetails.additionalTextEdits,
       detail: detailText,
       documentation: getNodeDocumentation(suggestion.ui5Node, model),
-      kind: lspKind
+      kind: lspKind,
       // TODO tags are not supported in Theia: https://che-incubator.github.io/vscode-theia-comparator/status.html
       // tags: suggestion.ui5Node.deprecatedInfo?.isDeprecated
       //   ? [CompletionItemTag.Deprecated]
@@ -130,7 +130,7 @@ function createTextEdits(
   const additionalTextEdits: TextEdit[] = [];
   let range: Range = {
     start: originalPosition,
-    end: originalPosition
+    end: originalPosition,
   };
   let newText = suggestion.ui5Node.name;
 
@@ -240,10 +240,10 @@ function createTextEdits(
   return {
     textEdit: {
       range,
-      newText
+      newText,
     },
     filterText,
-    additionalTextEdits
+    additionalTextEdits,
   };
 }
 
@@ -312,7 +312,7 @@ function getClosingTagTextEdits(
     if (closingTagNameRange !== undefined) {
       const closingTagNameTextEdit = {
         newText: closingTagName,
-        range: closingTagNameRange
+        range: closingTagNameRange,
       };
       textEdits.push(closingTagNameTextEdit);
     }
@@ -327,7 +327,7 @@ function getClosingTagTextEdits(
     if (closingTagRange !== undefined) {
       const closingTagTextEdit = {
         newText: `</${closingTagName}>`,
-        range: closingTagRange
+        range: closingTagRange,
       };
       textEdits.push(closingTagTextEdit);
     }
@@ -374,7 +374,7 @@ function rangeContains(range: Range, inner: Range): boolean {
 function createInsertRange(line: number, column: number): Range {
   return {
     start: Position.create(line - 1, column),
-    end: Position.create(line - 1, column)
+    end: Position.create(line - 1, column),
   };
 }
 
@@ -389,7 +389,7 @@ function positionToRange(
   if (position !== undefined && !isDummyPosition(position)) {
     return {
       start: Position.create(position.startLine - 1, position.startColumn - 1),
-      end: Position.create(position.endLine - 1, position.endColumn)
+      end: Position.create(position.endLine - 1, position.endColumn),
     };
   }
   return undefined;
@@ -404,7 +404,7 @@ function getClassNamespacePrefix(
   /* istanbul ignore else */
   if (parent !== undefined) {
     const parentFQN = ui5NodeToFQN(parent);
-    let xmlnsPrefix = findKey(xmlElement.namespaces, _ => _ === parentFQN);
+    let xmlnsPrefix = findKey(xmlElement.namespaces, (_) => _ === parentFQN);
     // Namespace not defined in imports - guess it
     if (xmlnsPrefix === undefined) {
       // It should be the parent simple name by default, but if that already exists we'll add an index to it (name2 etc)
@@ -460,7 +460,7 @@ function getAddNamespaceEdit(
     const range = createInsertRange(position.endLine, position.endColumn);
     return {
       range,
-      newText: ` xmlns:${xmlns}="${value}"`
+      newText: ` xmlns:${xmlns}="${value}"`,
     };
   }
   // See above for why this case is ignored.

packages/language-server/src/documentation.ts

@@ -1,11 +1,11 @@
 import {
   UI5SemanticModel,
-  BaseUI5Node
+  BaseUI5Node,
 } from "@ui5-language-assistant/semantic-model-types";
 import { MarkupContent } from "vscode-languageserver";
 import {
   getRootSymbolParent,
-  ui5NodeToFQN
+  ui5NodeToFQN,
 } from "@ui5-language-assistant/logic-utils";
 import { GENERATED_LIBRARY } from "@ui5-language-assistant/semantic-model";
 
@@ -137,7 +137,7 @@ function convertDescriptionToMarkup(
 
   return {
     kind: "markdown",
-    value: contents
+    value: contents,
   };
 }
 

packages/language-server/src/server.ts

@@ -6,7 +6,7 @@ import {
   ProposedFeatures,
   TextDocumentPositionParams,
   CompletionItem,
-  InitializeParams
+  InitializeParams,
 } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { UI5SemanticModel } from "@ui5-language-assistant/semantic-model-types";
@@ -30,9 +30,9 @@ connection.onInitialize((params: InitializeParams) => {
         resolveProvider: true,
         // TODO: can the trigger characters be more contextual?
         //       e.g: "<" of open tag only, not else where
-        triggerCharacters: ['"', "'", ":", "<"]
-      }
-    }
+        triggerCharacters: ['"', "'", ":", "<"],
+      },
+    },
   };
 });
 
@@ -64,7 +64,7 @@ connection.onCompletionResolve(
   }
 );
 
-documents.onDidChangeContent(async changeEvent => {
+documents.onDidChangeContent(async (changeEvent) => {
   if (getSemanticModelPromise === undefined) {
     return;
   }

packages/language-server/src/ui5-model.ts

@@ -7,7 +7,7 @@ import { UI5SemanticModel } from "@ui5-language-assistant/semantic-model-types";
 import {
   generate,
   Json,
-  TypeNameFix
+  TypeNameFix,
 } from "@ui5-language-assistant/semantic-model";
 import { Fetcher } from "../api";
 
@@ -49,7 +49,7 @@ export async function getSemanticModelWithFetcher(
   }
 
   await Promise.all(
-    map(libs, async libName => {
+    map(libs, async (libName) => {
       const cacheFilePath = getCacheFilePath(cacheFolder, libName);
       let apiJson = await readFromCache(cacheFilePath);
       // If the file doesn't exist in the cache (or we couldn't read it), fetch it from the network
@@ -74,7 +74,7 @@ export async function getSemanticModelWithFetcher(
     libraries: jsonMap,
     typeNameFix: getTypeNameFix(),
     strict: false,
-    printValidationErrors: false
+    printValidationErrors: false,
   });
 }
 
@@ -154,7 +154,7 @@ function getTypeNameFix(): TypeNameFix {
     "sap.ui.vk.AnimationTimeSlider": undefined,
     "sap.ui.vk.SelectionMode": undefined,
     "sap.ui.vk.RenderMode": undefined,
-    "sap.viz.ui5.controls.VizRangeSlider": undefined
+    "sap.viz.ui5.controls.VizRangeSlider": undefined,
   };
   return fixes;
 }
@@ -211,6 +211,6 @@ function getLibs(): string[] {
     "sap.ushell",
     "sap.uxap",
     "sap.viz",
-    "sap.zen.commons"
+    "sap.zen.commons",
   ];
 }

packages/language-server/src/xml-view-diagnostics.ts

@@ -4,7 +4,7 @@ import { assertNever } from "assert-never";
 import {
   Diagnostic,
   DiagnosticSeverity,
-  DiagnosticTag
+  DiagnosticTag,
 } from "vscode-languageserver-types";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { DocumentCstNode, parse } from "@xml-tools/parser";
@@ -13,7 +13,7 @@ import { UI5SemanticModel } from "@ui5-language-assistant/semantic-model-types";
 import {
   UI5XMLViewIssue,
   validateXMLView,
-  XMLViewIssueSeverity
+  XMLViewIssueSeverity,
 } from "@ui5-language-assistant/xml-views-validation";
 
 export function getXMLViewDiagnostics(opts: {
@@ -25,7 +25,7 @@ export function getXMLViewDiagnostics(opts: {
   const xmlDocAst = buildAst(cst as DocumentCstNode, tokenVector);
   const issues = validateXMLView({
     xmlView: xmlDocAst,
-    model: opts.ui5Model
+    model: opts.ui5Model,
   });
   const diagnostics = validationIssuesToLspDiagnostics(issues, opts.document);
   return diagnostics;
@@ -35,28 +35,28 @@ function validationIssuesToLspDiagnostics(
   issues: UI5XMLViewIssue[],
   document: TextDocument
 ): Diagnostic[] {
-  const diagnostics: Diagnostic[] = map(issues, currIssue => {
+  const diagnostics: Diagnostic[] = map(issues, (currIssue) => {
     const commonDiagnosticPros: Diagnostic = {
       range: {
         start: document.positionAt(currIssue.offsetRange.start),
         // Chevrotain's end offsets are none inclusive
-        end: document.positionAt(currIssue.offsetRange.end + 1)
+        end: document.positionAt(currIssue.offsetRange.end + 1),
       },
       severity: toLspSeverity(currIssue.severity),
       source: "UI5 Language Assistant",
-      message: currIssue.message
+      message: currIssue.message,
     };
 
     const issueKind = currIssue.kind;
     switch (issueKind) {
       case "UnknownEnumValue":
         return {
-          ...commonDiagnosticPros
+          ...commonDiagnosticPros,
         };
       case "UseOfDeprecatedClass":
         return {
           ...commonDiagnosticPros,
-          tags: [DiagnosticTag.Deprecated]
+          tags: [DiagnosticTag.Deprecated],
         };
       /* istanbul ignore next - defensive programming */
       default: