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: Sat, 4 Feb 2023 05:36:15 +0200 Message-ID: <2a710b11-4e3c-3103-19ee-cf313526ad63@yandex.ru> 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> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------wApBWYgGtkm01kzn09e6pqK4" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31812"; 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 Sat Feb 04 04:37:15 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 1pO9MY-000856-Sx for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 04 Feb 2023 04:37:14 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pO9MO-0004U4-TW; Fri, 03 Feb 2023 22:37:04 -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 1pO9MN-0004Tg-5H for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2023 22:37:03 -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 1pO9MM-000527-9v for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2023 22:37:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pO9ML-0007GV-Vp for bug-gnu-emacs@gnu.org; Fri, 03 Feb 2023 22:37:02 -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 03:37: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.167548178827886 (code B ref 61205); Sat, 04 Feb 2023 03:37:01 +0000 Original-Received: (at 61205) by debbugs.gnu.org; 4 Feb 2023 03:36:28 +0000 Original-Received: from localhost ([127.0.0.1]:40313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pO9Ln-0007Fg-R0 for submit@debbugs.gnu.org; Fri, 03 Feb 2023 22:36:28 -0500 Original-Received: from mail-wm1-f53.google.com ([209.85.128.53]:55932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pO9Lk-0007FS-4b for 61205@debbugs.gnu.org; Fri, 03 Feb 2023 22:36:26 -0500 Original-Received: by mail-wm1-f53.google.com with SMTP id q8so5183989wmo.5 for <61205@debbugs.gnu.org>; Fri, 03 Feb 2023 19:36:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:references:cc:to:from:content-language:subject :user-agent:mime-version:date:message-id:sender:from:to:cc:subject :date:message-id:reply-to; bh=Yew125UAfXXYx3Glahv/ead2o8K7Q8eeLBo9Zj9jY1w=; b=e3THGTL2KmtymkOHM1dcEWbw6rHPC8rGIlGanV/1CX1qY5/Bguo9XaqbVrmQCDlb4n FjLw03gsSNtTN/ALsUiuMw3cNUqlO3sJeMXT2Tvy0ZD0W85z2jeim83oViuW6HKHR++x a8dlEmA3wUkpvA5JRdN1RF11nqfbSP56xBFF4Zqxt8oY1Pkm8TOa5FKXZpt63Rqu+qjX rUNbp1JdKD7XSKgU49G4U9ISc+EXTlhiovWQnRn+Jjl3+sV4qCYNulBcm+r1SwUcqElu /ZyYzXm2pMzc/GMRADY8rtHuj18MSFU+77oor4KJJvzAhJyE1z0x4bXU1mBJZt9JyLsr ckfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:references:cc:to:from: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=Yew125UAfXXYx3Glahv/ead2o8K7Q8eeLBo9Zj9jY1w=; b=TJJERBGQ9CRRAcVPZLDl8Tkxqz+b4MSNXjKTbcGaG6JUCEJHsF/W2sWBA2JALIUMBQ 7CUWEMDkSt7YqbM3FPqGpkqakoKxTHvqmLLX3eERg52T9JtjbFsCRpeYCVt/FL80zX8C WNFHU6fYwtsC9iW8mh4Bj7E7xw7TRNpN4AehRkQPc4vj52VKRW/PCE+lEcMxjDhAD+WP vvq2hRdEvl2VYd54HTdOyjmo3w8r5DigVkjNECZ+J1/Ik25ULDIYGpsYIVQxBTn1vL1o uw0whZ6Kft/DrvWlOryLRyWpa0EiKHDijCULix3ng+EydlnB0ocMgtOcREHO0z1IAK0O dSYg== X-Gm-Message-State: AO0yUKW3awQGWZyxzstokTFKu5slGnCHJc6fObjtUyr7RmZaIIKwSUJL llfmiwArC4Hd2ph3dEEqm+w= X-Google-Smtp-Source: AK7set/FZvhn6sIq4pUu/+7HYkNmUKD6+48DZd6AwqB7dy6J3tt2uiq0RB/64eYQtUs1oLyUz5NviQ== X-Received: by 2002:a05:600c:3d90:b0:3df:eedf:f378 with SMTP id bi16-20020a05600c3d9000b003dfeedff378mr1880112wmb.24.1675481778038; Fri, 03 Feb 2023 19:36:18 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id g42-20020a05600c4caa00b003de664d4c14sm4210481wmp.36.2023.02.03.19.36.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 03 Feb 2023 19:36:17 -0800 (PST) Content-Language: en-US In-Reply-To: <3f14adfd-8aef-9352-4c9a-fff71f4223fb@yandex.ru> 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:254747 Archived-At: This is a multi-part message in MIME format. --------------wApBWYgGtkm01kzn09e6pqK4 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 03/02/2023 19:10, Dmitry Gutov wrote: > On 03/02/2023 17:54, Eli Zaretskii wrote: >>> Date: Fri, 3 Feb 2023 17:15:05 +0200 >>> Cc:61205@debbugs.gnu.org,casouri@gmail.com,theo@thornhill.no,dev@rjt.dev >>> From: Dmitry Gutov >>> >>>> Then as far as I'm concerned, this can go to level 4, but it must be >>>> done consistently across all the *-ts modes.  So if some mode wants >>>> 'property' to be highlighted, and wants it badly, we should IMO keep >>>> it in C as well. >>> Consistency is what I'm after here. >>> >>> c-ts-mode, as well as go-ts-mode, rust-ts-mode and typescript-ts-mode, >>> all previously mentioned in this report, currently put it at 3. >>> >>> The rest put it as 4, or don't use it at all. >> The question is: how important is this for go-ts-mode, rust-ts-mode, >> and typescript-ts-mode?  I don't know the answer.  If the importance >> is not high, then this should be moved to level 4. > > Right. They don't seem to be particularly more important there than in > other modes. Or than 'function', for example. Here's the updated patch in the meantime. Not sure what to do with 'type' highlighting in rust-ts-mode yet. Additional scoping seems like will require a bunch of repetitions. Perhaps a :pred instruction to filter out children of a call_expression might work better. --------------wApBWYgGtkm01kzn09e6pqK4 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 b2RlLmVsIGIvbGlzcC9wcm9nbW9kZXMvYy10cy1tb2RlLmVsCmluZGV4IDM5MGY2N2E4ZThj Li4yMDZiMmU5OGZiMyAxMDA2NDQKLS0tIGEvbGlzcC9wcm9nbW9kZXMvYy10cy1tb2RlLmVs CisrKyBiL2xpc3AvcHJvZ21vZGVzL2MtdHMtbW9kZS5lbApAQCAtNzc0LDggKzc3NCw4IEBA IGMtdHMtYmFzZS1tb2RlCiAgIChzZXRxLWxvY2FsIHRyZWVzaXQtZm9udC1sb2NrLWZlYXR1 cmUtbGlzdAogICAgICAgICAgICAgICAnKCggY29tbWVudCBkZWZpbml0aW9uKQogICAgICAg ICAgICAgICAgICgga2V5d29yZCBwcmVwcm9jZXNzb3Igc3RyaW5nIHR5cGUpCi0gICAgICAg ICAgICAgICAgKCBhc3NpZ25tZW50IGNvbnN0YW50IGVzY2FwZS1zZXF1ZW5jZSBsYWJlbCBs aXRlcmFsIHByb3BlcnR5ICkKLSAgICAgICAgICAgICAgICAoIGJyYWNrZXQgZGVsaW1pdGVy IGVycm9yIGZ1bmN0aW9uIG9wZXJhdG9yIHZhcmlhYmxlKSkpKQorICAgICAgICAgICAgICAg ICggYXNzaWdubWVudCBjb25zdGFudCBlc2NhcGUtc2VxdWVuY2UgbGFiZWwgbGl0ZXJhbCkK KyAgICAgICAgICAgICAgICAoIGJyYWNrZXQgZGVsaW1pdGVyIGVycm9yIGZ1bmN0aW9uIG9w ZXJhdG9yIHByb3BlcnR5IHZhcmlhYmxlKSkpKQogCiA7OzsjIyNhdXRvbG9hZAogKGRlZmlu ZS1kZXJpdmVkLW1vZGUgYy10cy1tb2RlIGMtdHMtYmFzZS1tb2RlICJDIgpkaWZmIC0tZ2l0 IGEvbGlzcC9wcm9nbW9kZXMvZ28tdHMtbW9kZS5lbCBiL2xpc3AvcHJvZ21vZGVzL2dvLXRz LW1vZGUuZWwKaW5kZXggNWYzZTFlYTNlNjguLmE0YjY0ODA4Y2EyIDEwMDY0NAotLS0gYS9s aXNwL3Byb2dtb2Rlcy9nby10cy1tb2RlLmVsCisrKyBiL2xpc3AvcHJvZ21vZGVzL2dvLXRz LW1vZGUuZWwKQEAgLTExOSwxNyArMTE5LDI3IEBAIGdvLXRzLW1vZGUtLWZvbnQtbG9jay1z ZXR0aW5ncwogICAgOmZlYXR1cmUgJ2RlbGltaXRlcgogICAgJygoWyIsIiAiLiIgIjsiICI6 Il0pIEBmb250LWxvY2stZGVsaW1pdGVyLWZhY2UpCiAKKyAgIDpsYW5ndWFnZSAnZ28KKyAg IDpmZWF0dXJlICdkZWZpbml0aW9uCisgICAnKChmdW5jdGlvbl9kZWNsYXJhdGlvbgorICAg ICAgbmFtZTogKGlkZW50aWZpZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFtZS1mYWNlKQor ICAgICAobWV0aG9kX2RlY2xhcmF0aW9uCisgICAgICBuYW1lOiAoZmllbGRfaWRlbnRpZmll cikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpCisgICAgIChtZXRob2Rfc3BlYwor ICAgICAgbmFtZTogKGZpZWxkX2lkZW50aWZpZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFt ZS1mYWNlKSkKKworICAgOmxhbmd1YWdlICdnbworICAgOmZlYXR1cmUgJ2RlZmluaXRpb24K KyAgICcoKGZpZWxkX2RlY2xhcmF0aW9uCisgICAgICBuYW1lOiAoZmllbGRfaWRlbnRpZmll cikgQGZvbnQtbG9jay1wcm9wZXJ0eS1mYWNlKSkKKwogICAgOmxhbmd1YWdlICdnbwogICAg OmZlYXR1cmUgJ2Z1bmN0aW9uCiAgICAnKChjYWxsX2V4cHJlc3Npb24KICAgICAgIGZ1bmN0 aW9uOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpCiAgICAg IChjYWxsX2V4cHJlc3Npb24KICAgICAgIGZ1bmN0aW9uOiAoc2VsZWN0b3JfZXhwcmVzc2lv bgotICAgICAgICAgICAgICAgICBmaWVsZDogKGZpZWxkX2lkZW50aWZpZXIpIEBmb250LWxv Y2stZnVuY3Rpb24tbmFtZS1mYWNlKSkKLSAgICAgKGZ1bmN0aW9uX2RlY2xhcmF0aW9uCi0g ICAgICBuYW1lOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2Up Ci0gICAgIChtZXRob2RfZGVjbGFyYXRpb24KLSAgICAgIG5hbWU6IChmaWVsZF9pZGVudGlm aWVyKSBAZm9udC1sb2NrLWZ1bmN0aW9uLW5hbWUtZmFjZSkpCisgICAgICAgICAgICAgICAg IGZpZWxkOiAoZmllbGRfaWRlbnRpZmllcikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZh Y2UpKSkKIAogICAgOmxhbmd1YWdlICdnbwogICAgOmZlYXR1cmUgJ2tleXdvcmQKQEAgLTIx NywxMSArMjI3LDEwIEBAIGdvLXRzLW1vZGUKICAgICA7OyBGb250LWxvY2suCiAgICAgKHNl dHEtbG9jYWwgdHJlZXNpdC1mb250LWxvY2stc2V0dGluZ3MgZ28tdHMtbW9kZS0tZm9udC1s b2NrLXNldHRpbmdzKQogICAgIChzZXRxLWxvY2FsIHRyZWVzaXQtZm9udC1sb2NrLWZlYXR1 cmUtbGlzdAotICAgICAgICAgICAgICAgICcoKCBjb21tZW50KQorICAgICAgICAgICAgICAg ICcoKCBjb21tZW50IGRlZmluaXRpb24pCiAgICAgICAgICAgICAgICAgICAoIGtleXdvcmQg c3RyaW5nIHR5cGUpCi0gICAgICAgICAgICAgICAgICAoIGNvbnN0YW50IGVzY2FwZS1zZXF1 ZW5jZSBmdW5jdGlvbiBsYWJlbCBudW1iZXIKLSAgICAgICAgICAgICAgICAgICAgcHJvcGVy dHkgdmFyaWFibGUpCi0gICAgICAgICAgICAgICAgICAoIGJyYWNrZXQgZGVsaW1pdGVyIGVy cm9yIG9wZXJhdG9yKSkpCisgICAgICAgICAgICAgICAgICAoIGNvbnN0YW50IGVzY2FwZS1z ZXF1ZW5jZSBsYWJlbCBudW1iZXIpCisgICAgICAgICAgICAgICAgICAoIGJyYWNrZXQgZGVs aW1pdGVyIGVycm9yIGZ1bmN0aW9uIG9wZXJhdG9yIHByb3BlcnR5IHZhcmlhYmxlKSkpCiAK ICAgICAodHJlZXNpdC1tYWpvci1tb2RlLXNldHVwKSkpCiAKZGlmZiAtLWdpdCBhL2xpc3Av cHJvZ21vZGVzL3J1c3QtdHMtbW9kZS5lbCBiL2xpc3AvcHJvZ21vZGVzL3J1c3QtdHMtbW9k ZS5lbAppbmRleCBlMzE3NzkzZDIxMS4uNjYyYzI4NjcxNmIgMTAwNjQ0Ci0tLSBhL2xpc3Av cHJvZ21vZGVzL3J1c3QtdHMtbW9kZS5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy9ydXN0LXRz LW1vZGUuZWwKQEAgLTE1NSw2ICsxNTUsMTYgQEAgcnVzdC10cy1tb2RlLS1mb250LWxvY2st c2V0dGluZ3MKICAgIDpmZWF0dXJlICdkZWxpbWl0ZXIKICAgICcoKFsiLCIgIi4iICI7IiAi OiIgIjo6Il0pIEBmb250LWxvY2stZGVsaW1pdGVyLWZhY2UpCiAKKyAgIDpsYW5ndWFnZSAn cnVzdAorICAgOmZlYXR1cmUgJ2RlZmluaXRpb24KKyAgICcoKGZ1bmN0aW9uX2l0ZW0gbmFt ZTogKGlkZW50aWZpZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFtZS1mYWNlKQorICAgICAo bWFjcm9fZGVmaW5pdGlvbiAibWFjcm9fcnVsZXMhIiBAZm9udC1sb2NrLWNvbnN0YW50LWZh Y2UpCisgICAgIChtYWNyb19kZWZpbml0aW9uIChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXBy ZXByb2Nlc3Nvci1mYWNlKSkKKworICAgOmxhbmd1YWdlICdydXN0CisgICA6ZmVhdHVyZSAn ZGVmaW5pdGlvbgorICAgJygoZmllbGRfZGVjbGFyYXRpb24gbmFtZTogKGZpZWxkX2lkZW50 aWZpZXIpIEBmb250LWxvY2stcHJvcGVydHktZmFjZSkpCisKICAgIDpsYW5ndWFnZSAncnVz dAogICAgOmZlYXR1cmUgJ2Z1bmN0aW9uCiAgICAnKChjYWxsX2V4cHJlc3Npb24KQEAgLTE2 NCwxNSArMTc0LDEyIEBAIHJ1c3QtdHMtbW9kZS0tZm9udC1sb2NrLXNldHRpbmdzCiAgICAg ICAgIGZpZWxkOiAoZmllbGRfaWRlbnRpZmllcikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1l LWZhY2UpCiAgICAgICAgKHNjb3BlZF9pZGVudGlmaWVyCiAgICAgICAgIG5hbWU6IChpZGVu dGlmaWVyKSBAZm9udC1sb2NrLWZ1bmN0aW9uLW5hbWUtZmFjZSldKQotICAgICAoZnVuY3Rp b25faXRlbSAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpCiAg ICAgIChnZW5lcmljX2Z1bmN0aW9uCiAgICAgICBmdW5jdGlvbjogWyhpZGVudGlmaWVyKSBA Zm9udC1sb2NrLWZ1bmN0aW9uLW5hbWUtZmFjZQogICAgICAgICAgICAgICAgICAoZmllbGRf ZXhwcmVzc2lvbgogICAgICAgICAgICAgICAgICAgZmllbGQ6IChmaWVsZF9pZGVudGlmaWVy KSBAZm9udC1sb2NrLWZ1bmN0aW9uLW5hbWUtZmFjZSkKICAgICAgICAgICAgICAgICAgKHNj b3BlZF9pZGVudGlmaWVyCiAgICAgICAgICAgICAgICAgICBuYW1lOiAoaWRlbnRpZmllcikg QGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpXSkKLSAgICAgKG1hY3JvX2RlZmluaXRp b24gIm1hY3JvX3J1bGVzISIgQGZvbnQtbG9jay1jb25zdGFudC1mYWNlKQotICAgICAobWFj cm9fZGVmaW5pdGlvbiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1wcmVwcm9jZXNzb3ItZmFj ZSkKICAgICAgKG1hY3JvX2ludm9jYXRpb24gbWFjcm86IChpZGVudGlmaWVyKSBAZm9udC1s b2NrLXByZXByb2Nlc3Nvci1mYWNlKSkKIAogICAgOmxhbmd1YWdlICdydXN0CkBAIC0yMDgs NyArMjE1LDYgQEAgcnVzdC10cy1tb2RlLS1mb250LWxvY2stc2V0dGluZ3MKICAgICAgKG1v ZF9pdGVtIG5hbWU6IChpZGVudGlmaWVyKSBAZm9udC1sb2NrLWNvbnN0YW50LWZhY2UpCiAg ICAgIChwcmltaXRpdmVfdHlwZSkgQGZvbnQtbG9jay10eXBlLWZhY2UKICAgICAgKHR5cGVf aWRlbnRpZmllcikgQGZvbnQtbG9jay10eXBlLWZhY2UKLSAgICAgKHNjb3BlZF9pZGVudGlm aWVyIG5hbWU6IChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXR5cGUtZmFjZSkKICAgICAgKHNj b3BlZF9pZGVudGlmaWVyIHBhdGg6IChpZGVudGlmaWVyKSBAZm9udC1sb2NrLWNvbnN0YW50 LWZhY2UpCiAgICAgIChzY29wZWRfaWRlbnRpZmllcgogICAgICAgKHNjb3BlZF9pZGVudGlm aWVyCkBAIC0zMTcsMTEgKzMyMywxMSBAQCBydXN0LXRzLW1vZGUKICAgICA7OyBGb250LWxv Y2suCiAgICAgKHNldHEtbG9jYWwgdHJlZXNpdC1mb250LWxvY2stc2V0dGluZ3MgcnVzdC10 cy1tb2RlLS1mb250LWxvY2stc2V0dGluZ3MpCiAgICAgKHNldHEtbG9jYWwgdHJlZXNpdC1m b250LWxvY2stZmVhdHVyZS1saXN0Ci0gICAgICAgICAgICAgICAgJygoIGNvbW1lbnQpCisg ICAgICAgICAgICAgICAgJygoIGNvbW1lbnQgZGVmaW5pdGlvbikKICAgICAgICAgICAgICAg ICAgICgga2V5d29yZCBzdHJpbmcpCiAgICAgICAgICAgICAgICAgICAoIGF0dHJpYnV0ZSBi dWlsdGluIGNvbnN0YW50IGVzY2FwZS1zZXF1ZW5jZQotICAgICAgICAgICAgICAgICAgICBm dW5jdGlvbiBudW1iZXIgcHJvcGVydHkgdHlwZSB2YXJpYWJsZSkKLSAgICAgICAgICAgICAg ICAgICggYnJhY2tldCBkZWxpbWl0ZXIgZXJyb3Igb3BlcmF0b3IpKSkKKyAgICAgICAgICAg ICAgICAgICAgbnVtYmVyIHR5cGUpCisgICAgICAgICAgICAgICAgICAoIGJyYWNrZXQgZGVs aW1pdGVyIGVycm9yIGZ1bmN0aW9uIG9wZXJhdG9yIHByb3BlcnR5IHZhcmlhYmxlKSkpCiAK ICAgICA7OyBJbWVudS4KICAgICAoc2V0cS1sb2NhbCB0cmVlc2l0LXNpbXBsZS1pbWVudS1z ZXR0aW5ncwpkaWZmIC0tZ2l0IGEvdGVzdC9tYW51YWwvZXRhZ3MvcnMtc3JjL3Rlc3QucnMg Yi90ZXN0L21hbnVhbC9ldGFncy9ycy1zcmMvdGVzdC5ycwppbmRleCAwODFkMGQ3ZDRkZi4u MDZjZGUwZTc5ZTIgMTAwNjQ0Ci0tLSBhL3Rlc3QvbWFudWFsL2V0YWdzL3JzLXNyYy90ZXN0 LnJzCisrKyBiL3Rlc3QvbWFudWFsL2V0YWdzL3JzLXNyYy90ZXN0LnJzCkBAIC0xLDUgKzEs MTAgQEAKIG1vZCB0ZXN0OwogCit1c2Ugc3RkOjpjb2xsZWN0aW9uczo6aGFzaF9tYXA6Ontz ZWxmLCBIYXNoTWFwfTsKKwordXNlIHN0ZDo6cGF0aDo6e3NlbGYsIFBhdGgsIFBhdGhCdWZ9 OyAgLy8gZ29vZDogc3RkIGlzIGEgY3JhdGUgbmFtZQordXNlIGNyYXRlOjpmb286OmJhejo6 Zm9vYmF6OyAgICAvLyBnb29kOiBmb28gaXMgYXQgdGhlIHJvb3Qgb2YgdGhlIGNyYXRlCisK IGVudW0gSXBBZGRyS2luZCB7CiAgICAgVjQsCiAgICAgVjYsCkBAIC0xMiwzICsxNyw2OSBA QCBmbiB0ZXN0MSgpIHsKIGZuIG1haW4oKSB7CiAgICB0ZXN0Ojp0ZXN0MSgpOwogfQorCitm biBlYXRfYm94X2kzMihib3hlZF9pMzI6IEJveDxpMzI+KSB7CisgICAgcHJpbnRsbiEoIkRl c3Ryb3lpbmcgYm94IHRoYXQgY29udGFpbnMge30iLCBib3hlZF9pMzIpOworfQorCisvLyBU aGlzIGZ1bmN0aW9uIGJvcnJvd3MgYW4gaTMyCitmbiBib3Jyb3dfaTMyKGJvcnJvd2VkX2kz MjogJmkzMikgeworICAgIHByaW50bG4hKCJUaGlzIGludCBpczoge30iLCBib3Jyb3dlZF9p MzIpOworfQorCitzdHJ1Y3QgVmFsIHsKKyAgICB2YWw6IGY2NCwKK30KKworc3RydWN0IEdl blZhbDxUPiB7CisgICAgZ2VuX3ZhbDogVCwKK30KKworLy8gaW1wbCBvZiBWYWwKK2ltcGwg VmFsIHsKKyAgICBmbiB2YWx1ZSgmc2VsZikgLT4gJmY2NCB7CisgICAgICAgICZzZWxmLnZh bAorICAgIH0KK30KKworLy8gaW1wbCBvZiBHZW5WYWwgZm9yIGEgZ2VuZXJpYyB0eXBlIGBU YAoraW1wbDxUPiBHZW5WYWw8VD4geworICAgIGZuIHZhbHVlKCZzZWxmKSAtPiAmVCB7Cisg ICAgICAgICZzZWxmLmdlbl92YWwKKyAgICB9Cit9CisKK2ZuIG1haW4oKSB7CisgICAgbGV0 IHggPSBWYWwgeyB2YWw6IDMuMCB9OworICAgIGxldCB5ID0gR2VuVmFsIHsgZ2VuX3ZhbDog M2kzMiB9OworCisgICAgcHJpbnRsbiEoInt9LCB7fSIsIHgudmFsdWUoKSwgeS52YWx1ZSgp KTsKK30KKworZm4gbWFpbigpIHsKKyAgICAvLyBDcmVhdGUgYSBib3hlZCBpMzIsIGFuZCBh IHN0YWNrZWQgaTMyCisgICAgbGV0IGJveGVkX2kzMiA9IEJveDo6bmV3KDVfaTMyKTsKKyAg ICBsZXQgc3RhY2tlZF9pMzIgPSA2X2kzMjsKKworICAgIC8vIEJvcnJvdyB0aGUgY29udGVu dHMgb2YgdGhlIGJveC4gT3duZXJzaGlwIGlzIG5vdCB0YWtlbiwKKyAgICAvLyBzbyB0aGUg Y29udGVudHMgY2FuIGJlIGJvcnJvd2VkIGFnYWluLgorICAgIGJvcnJvd19pMzIoJmJveGVk X2kzMik7CisgICAgYm9ycm93X2kzMigmc3RhY2tlZF9pMzIpOworCisgICAgeworICAgICAg ICAvLyBUYWtlIGEgcmVmZXJlbmNlIHRvIHRoZSBkYXRhIGNvbnRhaW5lZCBpbnNpZGUgdGhl IGJveAorICAgICAgICBsZXQgX3JlZl90b19pMzI6ICZpMzIgPSAmYm94ZWRfaTMyOworCisg ICAgICAgIC8vIEVycm9yIQorICAgICAgICAvLyBDYW4ndCBkZXN0cm95IGBib3hlZF9pMzJg IHdoaWxlIHRoZSBpbm5lciB2YWx1ZSBpcyBib3Jyb3dlZCBsYXRlciBpbiBzY29wZS4KKyAg ICAgICAgZWF0X2JveF9pMzIoYm94ZWRfaTMyKTsKKyAgICAgICAgLy8gRklYTUUgXiBDb21t ZW50IG91dCB0aGlzIGxpbmUKKworICAgICAgICAvLyBBdHRlbXB0IHRvIGJvcnJvdyBgX3Jl Zl90b19pMzJgIGFmdGVyIGlubmVyIHZhbHVlIGlzIGRlc3Ryb3llZAorICAgICAgICBib3Jy b3dfaTMyKF9yZWZfdG9faTMyKTsKKyAgICAgICAgLy8gYF9yZWZfdG9faTMyYCBnb2VzIG91 dCBvZiBzY29wZSBhbmQgaXMgbm8gbG9uZ2VyIGJvcnJvd2VkLgorICAgIH0KKworICAgIC8v IGBib3hlZF9pMzJgIGNhbiBub3cgZ2l2ZSB1cCBvd25lcnNoaXAgdG8gYGVhdF9ib3hgIGFu ZCBiZSBkZXN0cm95ZWQKKyAgICBlYXRfYm94X2kzMihib3hlZF9pMzIpOworfQo= --------------wApBWYgGtkm01kzn09e6pqK4--