Merge branch 'main' into fix/anyOf-compare-alternatives

Author: p-spacek

package.json

@@ -1,7 +1,7 @@
 {
   "name": "yaml-language-server",
   "description": "YAML language server",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "author": "Red Hat",
   "license": "MIT",
   "contributors": [

src/languageservice/parser/jsonParser07.ts

@@ -27,6 +27,7 @@ import { isArrayEqual } from '../utils/arrUtils';
 import { Node, Pair } from 'yaml';
 import { safeCreateUnicodeRegExp } from '../utils/strings';
 import { FilePatternAssociation } from '../services/yamlSchemaService';
+import { floatSafeRemainder } from '../utils/math';
 
 const localize = nls.loadMessageBundle();
 const MSG_PROPERTY_NOT_ALLOWED = 'Property {0} is not allowed.';
@@ -938,7 +939,7 @@ function validate(
     const val = node.value;
 
     if (isNumber(schema.multipleOf)) {
-      if (val % schema.multipleOf !== 0) {
+      if (floatSafeRemainder(val, schema.multipleOf) !== 0) {
         validationResult.problems.push({
           location: { offset: node.offset, length: node.length },
           severity: DiagnosticSeverity.Warning,

src/languageservice/services/yamlFormatter.ts

@@ -6,8 +6,9 @@
 
 import { Range, Position, TextEdit, FormattingOptions } from 'vscode-languageserver-types';
 import { CustomFormatterOptions, LanguageSettings } from '../yamlLanguageService';
-import { format, Options } from 'prettier';
+import { Options } from 'prettier';
 import * as parser from 'prettier/plugins/yaml';
+import { format } from 'prettier/standalone';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 
 export class YAMLFormatter {

src/languageservice/utils/math.ts

@@ -0,0 +1,8 @@
+export function floatSafeRemainder(val: number, step: number): number {
+  const valDecCount = (val.toString().split('.')[1] || '').length;
+  const stepDecCount = (step.toString().split('.')[1] || '').length;
+  const decCount = Math.max(valDecCount, stepDecCount);
+  const valInt = parseInt(val.toFixed(decCount).replace('.', ''));
+  const stepInt = parseInt(step.toFixed(decCount).replace('.', ''));
+  return (valInt % stepInt) / Math.pow(10, decCount);
+}

test/jsonParser.test.ts

@@ -1541,6 +1541,28 @@ describe('JSON Parser', () => {
     }
   });
 
+  it('multipleOfFloat', function () {
+    const schema: JsonSchema.JSONSchema = {
+      type: 'array',
+      items: {
+        type: 'number',
+        multipleOf: 0.05,
+      },
+    };
+    {
+      const { textDoc, jsonDoc } = toDocument('[0.9]');
+      const semanticErrors = jsonDoc.validate(textDoc, schema);
+
+      assert.strictEqual(semanticErrors.length, 0);
+    }
+    {
+      const { textDoc, jsonDoc } = toDocument('[42.3222222]');
+      const semanticErrors = jsonDoc.validate(textDoc, schema);
+
+      assert.strictEqual(semanticErrors.length, 1);
+    }
+  });
+
   it('dependencies with array', function () {
     const schema: JsonSchema.JSONSchema = {
       type: 'object',