From 8283f7a36a29c7fa9018a87a95f70ae80154b739 Mon Sep 17 00:00:00 2001
From: Crutishnyk <andrey.shcherbakov05@gmail.com>
Date: Wed, 11 Dec 2019 12:18:43 +0200
Subject: [PATCH] blockly: Update Blockly to the new validator framework

Bug: T237907
Change-Id: I08a52772081656fe2298d005531e85fbaee53de8
---
 groups/Blockly/Blockly.yaml  | 16 +++++-----------
 groups/Blockly/Checker.php   | 12 ------------
 groups/Blockly/Suggester.php | 23 -----------------------
 3 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 groups/Blockly/Checker.php
 delete mode 100644 groups/Blockly/Suggester.php

diff --git a/groups/Blockly/Blockly.yaml b/groups/Blockly/Blockly.yaml
index 9fac45cf6..c469c7320 100644
--- a/groups/Blockly/Blockly.yaml
+++ b/groups/Blockly/Blockly.yaml
@@ -11,17 +11,11 @@ TEMPLATE:
       sr-ec: sr
       sr-el: sr-latn
 
-  CHECKER:
-    class: BlocklyMessageChecker
-    checks:
-      - variablesCheck
-
-  INSERTABLES:
-    class: BlocklySuggester
-
-  AUTOLOAD:
-    BlocklyMessageChecker: Checker.php
-    BlocklySuggester: Suggester.php
+  VALIDATORS:
+    - id: InsertableRegex
+      insertable: true
+      enforce: true
+      params: /%[1-9]/
 
 ---
 BASIC:
diff --git a/groups/Blockly/Checker.php b/groups/Blockly/Checker.php
deleted file mode 100644
index f56096062..000000000
--- a/groups/Blockly/Checker.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * @file
- * @license GPL-2.0-or-later
- */
-
-class BlocklyMessageChecker extends MessageChecker {
-	protected function variablesCheck( $messages, $code, &$warnings ) {
-		// %1, %2, .., %9
-		return parent::parameterCheck( $messages, $code, $warnings, '/%[1-9]/' );
-	}
-}
diff --git a/groups/Blockly/Suggester.php b/groups/Blockly/Suggester.php
deleted file mode 100644
index 3e39fd6a4..000000000
--- a/groups/Blockly/Suggester.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * @file
- * @author Niklas Laxström
- * @author Siebrand Mazeland
- * @license GPL-2.0-or-later
- */
-
-class BlocklySuggester {
-	public function getInsertables( $text ) {
-		$insertables = [];
-
-		$matches = [];
-		// %1, %2, .., %9
-		preg_match_all( '/%[1-9]+/', $text, $matches, PREG_SET_ORDER );
-		$new = array_map( function ( $match ) {
-			return new Insertable( $match[0], $match[0] );
-		}, $matches );
-		$insertables = array_merge( $insertables, $new );
-
-		return $insertables;
-	}
-}