From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#61205: 'function' in 3rd element of treesit-font-lock-feature-list Date: Sun, 5 Feb 2023 01:44:40 +0200 Message-ID: References: <837cwzw8j1.fsf@gnu.org> <1b8044bd-6855-fdc7-697d-70322a8349c0@yandex.ru> <83k00zuejn.fsf@gnu.org> <83fsbmvj5x.fsf@gnu.org> <3f14adfd-8aef-9352-4c9a-fff71f4223fb@yandex.ru> <2a710b11-4e3c-3103-19ee-cf313526ad63@yandex.ru> <838rhdvs3c.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------3b0vRbBm5YdkSF5PIKdP8p0Z" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34320"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Cc: 61205@debbugs.gnu.org, casouri@gmail.com, theo@thornhill.no, dev@rjt.dev To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Feb 05 00:45:14 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pOSDZ-0008hf-TK for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 05 Feb 2023 00:45:14 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOSDP-0000RH-IZ; Sat, 04 Feb 2023 18:45:03 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pOSDO-0000QT-89 for bug-gnu-emacs@gnu.org; Sat, 04 Feb 2023 18:45:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pOSDN-0003G1-Ry for bug-gnu-emacs@gnu.org; Sat, 04 Feb 2023 18:45:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pOSDN-0001fO-Nx for bug-gnu-emacs@gnu.org; Sat, 04 Feb 2023 18:45:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 04 Feb 2023 23:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61205 X-GNU-PR-Package: emacs Original-Received: via spool by 61205-submit@debbugs.gnu.org id=B61205.16755542936380 (code B ref 61205); Sat, 04 Feb 2023 23:45:01 +0000 Original-Received: (at 61205) by debbugs.gnu.org; 4 Feb 2023 23:44:53 +0000 Original-Received: from localhost ([127.0.0.1]:43618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOSDE-0001ep-J2 for submit@debbugs.gnu.org; Sat, 04 Feb 2023 18:44:53 -0500 Original-Received: from mail-ej1-f49.google.com ([209.85.218.49]:33513) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pOSDB-0001eZ-2I for 61205@debbugs.gnu.org; Sat, 04 Feb 2023 18:44:51 -0500 Original-Received: by mail-ej1-f49.google.com with SMTP id ml19so25058498ejb.0 for <61205@debbugs.gnu.org>; Sat, 04 Feb 2023 15:44:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:sender:from:to:cc:subject :date:message-id:reply-to; bh=GNdA7ynzDxj6eDouEu0OiI8rfEkmvSENRaVIRn4IrOs=; b=XXURqmTJXDEMO/kwP5YCmOiexOrV7K1isyVcnNM2DdwYdkM2PwCHa/4L2ZKFy2HUmM RuewYL+5mS1iLNxtnkJCAzDiYQOW67qaB3dpMukl+Szc6GsRqZ9cnWOcTREOrspkcMsb IkW71Y/JpqXK+cIa0AkPXP01NCEyGmlCuqxcvYfh3bq5t4LHMZGOXrVC+Ze7V53nw21O l+K9z48/wYEygLFeqPBfZBonb5c3KcC90UKv43lMt+f0NHn9sXTMQDHg8wbvbgXj4lhd 9D4cByPhcIiOGVXIPYwYuamVDR2iTRiRMQTJgZ62VrJSUp6aZyzg91EN+qZeZzj/Pi// u09g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:sender:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=GNdA7ynzDxj6eDouEu0OiI8rfEkmvSENRaVIRn4IrOs=; b=OJCmk9VE4q0RKbld81zF5PEsr7yN75gVF08kNkZhbRZ3CVEHVwXkTlQiQmamJzkjxg LjOcDbk8v94Mshp2/ehFH9aJwJx3kOlrIRNaOKxkbiZ4QfYY1VwMLgygVVTdZrzOg7/j 2/0twtqnYkreJiFmFPoo/UBtBBYvj1V5RTjaeQBHUQvsmW9XEPcLs5vzbjQaT+mCp/wf JB252BzHPOeLeQC1yjK6vPEDYwZoj/SOoZRtTOdbkrejXpZCCxMx7/ImTVs1PWJDOcAz TuXEaV05Lz2c+FFZcv5/L32MZmxLLLkOBi0J8w6/j6dzLWsGuHYITtj1cm/bD8dqQLSJ nOTA== X-Gm-Message-State: AO0yUKXexvQWPWe/eNp0edAkkL7X+nuO2uMYBvCHRT64L7rjfjVu3U9z 8dPmhPz+RZbHc9UHF1Lfz2A= X-Google-Smtp-Source: AK7set+OLPQffItJO1h0bU9KpfgaVZdS6Hf6IVEJ2CvH7OjHBQBAErZO4KQ3MKd0lcA1MNRgXvJP4Q== X-Received: by 2002:a17:907:2bc2:b0:866:6b08:946b with SMTP id gv2-20020a1709072bc200b008666b08946bmr15536838ejc.39.1675554283160; Sat, 04 Feb 2023 15:44:43 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id u21-20020a170906125500b0089b6fd89429sm277825eja.10.2023.02.04.15.44.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Feb 2023 15:44:42 -0800 (PST) Content-Language: en-US In-Reply-To: <838rhdvs3c.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:254801 Archived-At: This is a multi-part message in MIME format. --------------3b0vRbBm5YdkSF5PIKdP8p0Z Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 04/02/2023 08:53, Eli Zaretskii wrote: >> Date: Sat, 4 Feb 2023 05:36:15 +0200 >> From: Dmitry Gutov >> Cc:61205@debbugs.gnu.org,casouri@gmail.com,theo@thornhill.no,dev@rjt.dev >> >> Here's the updated patch in the meantime. > Thanks, but please also update the doc string of > treesit-font-lock-level. Done. >> Not sure what to do with 'type' highlighting in rust-ts-mode yet. > What is the problem with that? The nodes structure of a 'use' instruction has a lot of nesting, and at least a couple of variations, which would lead to a combinatoric increase in the number of queries. Taking another look at the declarations, though, I wasn't sure I could understand the specific logic for choosing between font-lock-type-face and font-lock-constant-face. It seemed heavily inspired by https://github.com/tree-sitter/tree-sitter-rust/blob/master/queries/highlights.scm, though. So what I did is reverted to those rules (in that area): the path segments that start with an uppercase char get highlighted with font-lock-type-face. The rest don't get highlighted at all. That's how Rust code looks at Github, so a fair number of developers must be okay with it. (Github also highlights function calls, though.) I'm also adding function parameter highlighting to rust and go modes. See the attached patch. I suggest we install it in emacs-29, but then people are free to tweak the rules further. --------------3b0vRbBm5YdkSF5PIKdP8p0Z Content-Type: text/x-patch; charset=UTF-8; name="ts-modes-refine-features.diff" Content-Disposition: attachment; filename="ts-modes-refine-features.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2RvYy9lbWFjcy9kaXNwbGF5LnRleGkgYi9kb2MvZW1hY3MvZGlzcGxh eS50ZXhpCmluZGV4IDk3NzMyYjY1ZTMyLi5hODZjMTJhMGRiNyAxMDA2NDQKLS0tIGEvZG9j L2VtYWNzL2Rpc3BsYXkudGV4aQorKysgYi9kb2MvZW1hY3MvZGlzcGxheS50ZXhpCkBAIC0x MTU5LDExICsxMTU5LDExIEBAIFBhcnNlci1iYXNlZCBGb250IExvY2sKIFRoaXMgbGV2ZWwg YWRkcyBmb250aWZpY2F0aW9uIG9mIGtleXdvcmRzLCBzdHJpbmdzLCBhbmQgZGF0YSB0eXBl cy4KIEBpdGVtIExldmVsIDMKIFRoaXMgaXMgdGhlIGRlZmF1bHQgbGV2ZWw7IGl0IGFkZHMg Zm9udGlmaWNhdGlvbiBvZiBhc3NpZ25tZW50cywKLW51bWJlcnMsIHByb3BlcnRpZXMsIGV0 Yy4KK251bWJlcnMsIGV0Yy4KIEBpdGVtIExldmVsIDQKIFRoaXMgbGV2ZWwgYWRkcyBldmVy eXRoaW5nIGVsc2UgdGhhdCBjYW4gYmUgZm9udGlmaWVkOiBvcGVyYXRvcnMsCiBkZWxpbWl0 ZXJzLCBicmFja2V0cywgb3RoZXIgcHVuY3R1YXRpb24sIGZ1bmN0aW9uIG5hbWVzIGluIGZ1 bmN0aW9uCi1jYWxscywgdmFyaWFibGVzLCBldGMuCitjYWxscywgcHJvcGVydHkgbG9vayB1 cHMsIHZhcmlhYmxlcywgZXRjLgogQGVuZCB0YWJsZQogCiBAdmluZGV4IHRyZWVzaXQtZm9u dC1sb2NrLWZlYXR1cmUtbGlzdApkaWZmIC0tZ2l0IGEvbGlzcC9wcm9nbW9kZXMvYy10cy1t b2RlLmVsIGIvbGlzcC9wcm9nbW9kZXMvYy10cy1tb2RlLmVsCmluZGV4IDJhMTY0YWYyNmVh Li43MzAwMDc0ZTVjNiAxMDA2NDQKLS0tIGEvbGlzcC9wcm9nbW9kZXMvYy10cy1tb2RlLmVs CisrKyBiL2xpc3AvcHJvZ21vZGVzL2MtdHMtbW9kZS5lbApAQCAtNzc0LDggKzc3NCw4IEBA IGMtdHMtYmFzZS1tb2RlCiAgIChzZXRxLWxvY2FsIHRyZWVzaXQtZm9udC1sb2NrLWZlYXR1 cmUtbGlzdAogICAgICAgICAgICAgICAnKCggY29tbWVudCBkZWZpbml0aW9uKQogICAgICAg ICAgICAgICAgICgga2V5d29yZCBwcmVwcm9jZXNzb3Igc3RyaW5nIHR5cGUpCi0gICAgICAg ICAgICAgICAgKCBhc3NpZ25tZW50IGNvbnN0YW50IGVzY2FwZS1zZXF1ZW5jZSBsYWJlbCBs aXRlcmFsIHByb3BlcnR5ICkKLSAgICAgICAgICAgICAgICAoIGJyYWNrZXQgZGVsaW1pdGVy IGVycm9yIGZ1bmN0aW9uIG9wZXJhdG9yIHZhcmlhYmxlKSkpKQorICAgICAgICAgICAgICAg ICggYXNzaWdubWVudCBjb25zdGFudCBlc2NhcGUtc2VxdWVuY2UgbGFiZWwgbGl0ZXJhbCkK KyAgICAgICAgICAgICAgICAoIGJyYWNrZXQgZGVsaW1pdGVyIGVycm9yIGZ1bmN0aW9uIG9w ZXJhdG9yIHByb3BlcnR5IHZhcmlhYmxlKSkpKQogCiA7OzsjIyNhdXRvbG9hZAogKGRlZmlu ZS1kZXJpdmVkLW1vZGUgYy10cy1tb2RlIGMtdHMtYmFzZS1tb2RlICJDIgpkaWZmIC0tZ2l0 IGEvbGlzcC9wcm9nbW9kZXMvZ28tdHMtbW9kZS5lbCBiL2xpc3AvcHJvZ21vZGVzL2dvLXRz LW1vZGUuZWwKaW5kZXggOTVkY2Y2NTNmYzYuLjRiMTRlNTUyODFlIDEwMDY0NAotLS0gYS9s aXNwL3Byb2dtb2Rlcy9nby10cy1tb2RlLmVsCisrKyBiL2xpc3AvcHJvZ21vZGVzL2dvLXRz LW1vZGUuZWwKQEAgLTEyMywxNyArMTIzLDI2IEBAIGdvLXRzLW1vZGUtLWZvbnQtbG9jay1z ZXR0aW5ncwogICAgOmZlYXR1cmUgJ2RlbGltaXRlcgogICAgJygoWyIsIiAiLiIgIjsiICI6 Il0pIEBmb250LWxvY2stZGVsaW1pdGVyLWZhY2UpCiAKKyAgIDpsYW5ndWFnZSAnZ28KKyAg IDpmZWF0dXJlICdkZWZpbml0aW9uCisgICAnKChmdW5jdGlvbl9kZWNsYXJhdGlvbgorICAg ICAgbmFtZTogKGlkZW50aWZpZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFtZS1mYWNlKQor ICAgICAobWV0aG9kX2RlY2xhcmF0aW9uCisgICAgICBuYW1lOiAoZmllbGRfaWRlbnRpZmll cikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpCisgICAgIChtZXRob2Rfc3BlYwor ICAgICAgbmFtZTogKGZpZWxkX2lkZW50aWZpZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFt ZS1mYWNlKQorICAgICAoZmllbGRfZGVjbGFyYXRpb24KKyAgICAgIG5hbWU6IChmaWVsZF9p ZGVudGlmaWVyKSBAZm9udC1sb2NrLXByb3BlcnR5LWZhY2UpCisgICAgIChwYXJhbWV0ZXJf ZGVjbGFyYXRpb24KKyAgICAgIG5hbWU6IChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXZhcmlh YmxlLW5hbWUtZmFjZSkpCisKICAgIDpsYW5ndWFnZSAnZ28KICAgIDpmZWF0dXJlICdmdW5j dGlvbgogICAgJygoY2FsbF9leHByZXNzaW9uCiAgICAgICBmdW5jdGlvbjogKGlkZW50aWZp ZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFtZS1mYWNlKQogICAgICAoY2FsbF9leHByZXNz aW9uCiAgICAgICBmdW5jdGlvbjogKHNlbGVjdG9yX2V4cHJlc3Npb24KLSAgICAgICAgICAg ICAgICAgZmllbGQ6IChmaWVsZF9pZGVudGlmaWVyKSBAZm9udC1sb2NrLWZ1bmN0aW9uLW5h bWUtZmFjZSkpCi0gICAgIChmdW5jdGlvbl9kZWNsYXJhdGlvbgotICAgICAgbmFtZTogKGlk ZW50aWZpZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFtZS1mYWNlKQotICAgICAobWV0aG9k X2RlY2xhcmF0aW9uCi0gICAgICBuYW1lOiAoZmllbGRfaWRlbnRpZmllcikgQGZvbnQtbG9j ay1mdW5jdGlvbi1uYW1lLWZhY2UpKQorICAgICAgICAgICAgICAgICBmaWVsZDogKGZpZWxk X2lkZW50aWZpZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFtZS1mYWNlKSkpCiAKICAgIDps YW5ndWFnZSAnZ28KICAgIDpmZWF0dXJlICdrZXl3b3JkCkBAIC0yMjEsMTEgKzIzMCwxMCBA QCBnby10cy1tb2RlCiAgICAgOzsgRm9udC1sb2NrLgogICAgIChzZXRxLWxvY2FsIHRyZWVz aXQtZm9udC1sb2NrLXNldHRpbmdzIGdvLXRzLW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncykK ICAgICAoc2V0cS1sb2NhbCB0cmVlc2l0LWZvbnQtbG9jay1mZWF0dXJlLWxpc3QKLSAgICAg ICAgICAgICAgICAnKCggY29tbWVudCkKKyAgICAgICAgICAgICAgICAnKCggY29tbWVudCBk ZWZpbml0aW9uKQogICAgICAgICAgICAgICAgICAgKCBrZXl3b3JkIHN0cmluZyB0eXBlKQot ICAgICAgICAgICAgICAgICAgKCBjb25zdGFudCBlc2NhcGUtc2VxdWVuY2UgZnVuY3Rpb24g bGFiZWwgbnVtYmVyCi0gICAgICAgICAgICAgICAgICAgIHByb3BlcnR5IHZhcmlhYmxlKQot ICAgICAgICAgICAgICAgICAgKCBicmFja2V0IGRlbGltaXRlciBlcnJvciBvcGVyYXRvcikp KQorICAgICAgICAgICAgICAgICAgKCBjb25zdGFudCBlc2NhcGUtc2VxdWVuY2UgbGFiZWwg bnVtYmVyKQorICAgICAgICAgICAgICAgICAgKCBicmFja2V0IGRlbGltaXRlciBlcnJvciBm dW5jdGlvbiBvcGVyYXRvciBwcm9wZXJ0eSB2YXJpYWJsZSkpKQogCiAgICAgKHRyZWVzaXQt bWFqb3ItbW9kZS1zZXR1cCkpKQogCmRpZmYgLS1naXQgYS9saXNwL3Byb2dtb2Rlcy9ydXN0 LXRzLW1vZGUuZWwgYi9saXNwL3Byb2dtb2Rlcy9ydXN0LXRzLW1vZGUuZWwKaW5kZXggZTMx Nzc5M2QyMTEuLjU3MjJkMDM3YmJhIDEwMDY0NAotLS0gYS9saXNwL3Byb2dtb2Rlcy9ydXN0 LXRzLW1vZGUuZWwKKysrIGIvbGlzcC9wcm9nbW9kZXMvcnVzdC10cy1tb2RlLmVsCkBAIC0x NTUsNiArMTU1LDE2IEBAIHJ1c3QtdHMtbW9kZS0tZm9udC1sb2NrLXNldHRpbmdzCiAgICA6 ZmVhdHVyZSAnZGVsaW1pdGVyCiAgICAnKChbIiwiICIuIiAiOyIgIjoiICI6OiJdKSBAZm9u dC1sb2NrLWRlbGltaXRlci1mYWNlKQogCisgICA6bGFuZ3VhZ2UgJ3J1c3QKKyAgIDpmZWF0 dXJlICdkZWZpbml0aW9uCisgICAnKChmdW5jdGlvbl9pdGVtIG5hbWU6IChpZGVudGlmaWVy KSBAZm9udC1sb2NrLWZ1bmN0aW9uLW5hbWUtZmFjZSkKKyAgICAgKG1hY3JvX2RlZmluaXRp b24gIm1hY3JvX3J1bGVzISIgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlKQorICAgICAobWFj cm9fZGVmaW5pdGlvbiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1wcmVwcm9jZXNzb3ItZmFj ZSkKKyAgICAgKGZpZWxkX2RlY2xhcmF0aW9uIG5hbWU6IChmaWVsZF9pZGVudGlmaWVyKSBA Zm9udC1sb2NrLXByb3BlcnR5LWZhY2UpCisgICAgIChwYXJhbWV0ZXIgcGF0dGVybjogKGlk ZW50aWZpZXIpIEBmb250LWxvY2stdmFyaWFibGUtbmFtZS1mYWNlKQorICAgICAocGFyYW1l dGVyCisgICAgICBwYXR0ZXJuOiAocmVmZXJlbmNlX3BhdHRlcm4gKGlkZW50aWZpZXIpIEBm b250LWxvY2stdmFyaWFibGUtbmFtZS1mYWNlKSkpCisKICAgIDpsYW5ndWFnZSAncnVzdAog ICAgOmZlYXR1cmUgJ2Z1bmN0aW9uCiAgICAnKChjYWxsX2V4cHJlc3Npb24KQEAgLTE2NCwx NSArMTc0LDEyIEBAIHJ1c3QtdHMtbW9kZS0tZm9udC1sb2NrLXNldHRpbmdzCiAgICAgICAg IGZpZWxkOiAoZmllbGRfaWRlbnRpZmllcikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZh Y2UpCiAgICAgICAgKHNjb3BlZF9pZGVudGlmaWVyCiAgICAgICAgIG5hbWU6IChpZGVudGlm aWVyKSBAZm9udC1sb2NrLWZ1bmN0aW9uLW5hbWUtZmFjZSldKQotICAgICAoZnVuY3Rpb25f aXRlbSAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpCiAgICAg IChnZW5lcmljX2Z1bmN0aW9uCiAgICAgICBmdW5jdGlvbjogWyhpZGVudGlmaWVyKSBAZm9u dC1sb2NrLWZ1bmN0aW9uLW5hbWUtZmFjZQogICAgICAgICAgICAgICAgICAoZmllbGRfZXhw cmVzc2lvbgogICAgICAgICAgICAgICAgICAgZmllbGQ6IChmaWVsZF9pZGVudGlmaWVyKSBA Zm9udC1sb2NrLWZ1bmN0aW9uLW5hbWUtZmFjZSkKICAgICAgICAgICAgICAgICAgKHNjb3Bl ZF9pZGVudGlmaWVyCiAgICAgICAgICAgICAgICAgICBuYW1lOiAoaWRlbnRpZmllcikgQGZv bnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpXSkKLSAgICAgKG1hY3JvX2RlZmluaXRpb24g Im1hY3JvX3J1bGVzISIgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlKQotICAgICAobWFjcm9f ZGVmaW5pdGlvbiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1wcmVwcm9jZXNzb3ItZmFjZSkK ICAgICAgKG1hY3JvX2ludm9jYXRpb24gbWFjcm86IChpZGVudGlmaWVyKSBAZm9udC1sb2Nr LXByZXByb2Nlc3Nvci1mYWNlKSkKIAogICAgOmxhbmd1YWdlICdydXN0CkBAIC0yMDgsMjAg KzIxNSwyMCBAQCBydXN0LXRzLW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncwogICAgICAobW9k X2l0ZW0gbmFtZTogKGlkZW50aWZpZXIpIEBmb250LWxvY2stY29uc3RhbnQtZmFjZSkKICAg ICAgKHByaW1pdGl2ZV90eXBlKSBAZm9udC1sb2NrLXR5cGUtZmFjZQogICAgICAodHlwZV9p ZGVudGlmaWVyKSBAZm9udC1sb2NrLXR5cGUtZmFjZQotICAgICAoc2NvcGVkX2lkZW50aWZp ZXIgbmFtZTogKGlkZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlKQotICAgICAoc2Nv cGVkX2lkZW50aWZpZXIgcGF0aDogKGlkZW50aWZpZXIpIEBmb250LWxvY2stY29uc3RhbnQt ZmFjZSkKLSAgICAgKHNjb3BlZF9pZGVudGlmaWVyCi0gICAgICAoc2NvcGVkX2lkZW50aWZp ZXIKLSAgICAgICBwYXRoOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1jb25zdGFudC1mYWNl KSkKKyAgICAgKChzY29wZWRfaWRlbnRpZmllciBuYW1lOiAoaWRlbnRpZmllcikgQGZvbnQt bG9jay10eXBlLWZhY2UpCisgICAgICAoOm1hdGNoICJeW0EtWl0iIEBmb250LWxvY2stdHlw ZS1mYWNlKSkKKyAgICAgKChzY29wZWRfaWRlbnRpZmllciBwYXRoOiAoaWRlbnRpZmllcikg QGZvbnQtbG9jay10eXBlLWZhY2UpCisgICAgICAoOm1hdGNoICJeW0EtWl0iIEBmb250LWxv Y2stdHlwZS1mYWNlKSkKKyAgICAgKChzY29wZWRfaWRlbnRpZmllcgorICAgICAgICAoc2Nv cGVkX2lkZW50aWZpZXIKKyAgICAgICAgIHBhdGg6IChpZGVudGlmaWVyKSBAZm9udC1sb2Nr LXR5cGUtZmFjZSkpCisgICAgICAoOm1hdGNoICJeW0EtWl0iIEBmb250LWxvY2stdHlwZS1m YWNlKSkKICAgICAgKChzY29wZWRfaWRlbnRpZmllcgogICAgICAgIHBhdGg6IFsoaWRlbnRp ZmllcikgQGZvbnQtbG9jay10eXBlLWZhY2UKICAgICAgICAgICAgICAgKHNjb3BlZF9pZGVu dGlmaWVyCiAgICAgICAgICAgICAgICBuYW1lOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay10 eXBlLWZhY2UpXSkKICAgICAgICg6bWF0Y2ggIl5bQS1aXSIgQGZvbnQtbG9jay10eXBlLWZh Y2UpKQogICAgICAoc2NvcGVkX3R5cGVfaWRlbnRpZmllciBwYXRoOiAoaWRlbnRpZmllcikg QGZvbnQtbG9jay1jb25zdGFudC1mYWNlKQotICAgICAoc2NvcGVkX3VzZV9saXN0Ci0gICAg ICBwYXRoOiBbKGlkZW50aWZpZXIpIEBmb250LWxvY2stY29uc3RhbnQtZmFjZQotICAgICAg ICAgICAgIChzY29wZWRfaWRlbnRpZmllciAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1jb25z dGFudC1mYWNlKV0pCiAgICAgICh0eXBlX2lkZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1m YWNlCiAgICAgICh1c2VfYXNfY2xhdXNlIGFsaWFzOiAoaWRlbnRpZmllcikgQGZvbnQtbG9j ay10eXBlLWZhY2UpCiAgICAgICh1c2VfbGlzdCAoaWRlbnRpZmllcikgQGZvbnQtbG9jay10 eXBlLWZhY2UpKQpAQCAtMzE3LDExICszMjQsMTEgQEAgcnVzdC10cy1tb2RlCiAgICAgOzsg Rm9udC1sb2NrLgogICAgIChzZXRxLWxvY2FsIHRyZWVzaXQtZm9udC1sb2NrLXNldHRpbmdz IHJ1c3QtdHMtbW9kZS0tZm9udC1sb2NrLXNldHRpbmdzKQogICAgIChzZXRxLWxvY2FsIHRy ZWVzaXQtZm9udC1sb2NrLWZlYXR1cmUtbGlzdAotICAgICAgICAgICAgICAgICcoKCBjb21t ZW50KQorICAgICAgICAgICAgICAgICcoKCBjb21tZW50IGRlZmluaXRpb24pCiAgICAgICAg ICAgICAgICAgICAoIGtleXdvcmQgc3RyaW5nKQogICAgICAgICAgICAgICAgICAgKCBhdHRy aWJ1dGUgYnVpbHRpbiBjb25zdGFudCBlc2NhcGUtc2VxdWVuY2UKLSAgICAgICAgICAgICAg ICAgICAgZnVuY3Rpb24gbnVtYmVyIHByb3BlcnR5IHR5cGUgdmFyaWFibGUpCi0gICAgICAg ICAgICAgICAgICAoIGJyYWNrZXQgZGVsaW1pdGVyIGVycm9yIG9wZXJhdG9yKSkpCisgICAg ICAgICAgICAgICAgICAgIG51bWJlciB0eXBlKQorICAgICAgICAgICAgICAgICAgKCBicmFj a2V0IGRlbGltaXRlciBlcnJvciBmdW5jdGlvbiBvcGVyYXRvciBwcm9wZXJ0eSB2YXJpYWJs ZSkpKQogCiAgICAgOzsgSW1lbnUuCiAgICAgKHNldHEtbG9jYWwgdHJlZXNpdC1zaW1wbGUt aW1lbnUtc2V0dGluZ3MKZGlmZiAtLWdpdCBhL2xpc3AvdHJlZXNpdC5lbCBiL2xpc3AvdHJl ZXNpdC5lbAppbmRleCA5OGY0NDZhMTQ1Ni4uMjU2MmUxMjg2YzcgMTAwNjQ0Ci0tLSBhL2xp c3AvdHJlZXNpdC5lbAorKysgYi9saXNwL3RyZWVzaXQuZWwKQEAgLTU4NSw5ICs1ODUsMTAg QEAgdHJlZXNpdC1mb250LWxvY2stbGV2ZWwKIExldmVsIDEgdXN1YWxseSBjb250YWlucyBv bmx5IGNvbW1lbnRzIGFuZCBkZWZpbml0aW9ucy4KIExldmVsIDIgdXN1YWxseSBhZGRzIGtl eXdvcmRzLCBzdHJpbmdzLCBkYXRhIHR5cGVzLCBldGMuCiBMZXZlbCAzIHVzdWFsbHkgcmVw cmVzZW50cyBmdWxsLWJsb3duIGZvbnRpZmljYXRpb25zLCBpbmNsdWRpbmcKLWFzc2lnbm1l bnRzLCBjb25zdGFudHMsIG51bWJlcnMgYW5kIGxpdGVyYWxzLCBwcm9wZXJ0aWVzLCBldGMu Cithc3NpZ25tZW50cywgY29uc3RhbnRzLCBudW1iZXJzIGFuZCBsaXRlcmFscywgZXRjLgog TGV2ZWwgNCBhZGRzIGV2ZXJ5dGhpbmcgZWxzZSB0aGF0IGNhbiBiZSBmb250aWZpZWQ6IGRl bGltaXRlcnMsCi1vcGVyYXRvcnMsIGJyYWNrZXRzLCBwdW5jdHVhdGlvbiwgYWxsIGZ1bmN0 aW9ucyBhbmQgdmFyaWFibGVzLCBldGMuCitvcGVyYXRvcnMsIGJyYWNrZXRzLCBwdW5jdHVh dGlvbiwgYWxsIGZ1bmN0aW9ucywgcHJvcGVydGllcywKK3ZhcmlhYmxlcywgZXRjLgogCiBJ biBhZGRpdGlvbiB0byB0aGUgZGVjb3JhdGlvbiBsZXZlbCwgaW5kaXZpZHVhbCBmZWF0dXJl cyBjYW4gYmUKIHR1cm5lZCBvbi9vZmYgYnkgY2FsbGluZyBgdHJlZXNpdC1mb250LWxvY2st cmVjb21wdXRlLWZlYXR1cmVzJy4K --------------3b0vRbBm5YdkSF5PIKdP8p0Z--