From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jostein =?UTF-8?Q?Kj=C3=B8nigsen?= Newsgroups: gmane.emacs.bugs Subject: bug#60376: 29.0.60; Standardize csharp-ts-mode's font-lock features Date: Sun, 1 Jan 2023 19:14:02 +0100 Message-ID: <32bfc790-73fa-27b1-5fd8-50181e66015d@secure.kjonigsen.net> References: <1893BC1C-4205-4E49-A903-B226F8C0F235@gmail.com> <167e7ba3-ecb3-9e91-9a12-6020b4c1ec2b@secure.kjonigsen.net> <8538939b-5639-b8c0-82cc-113930a95ab1@secure.kjonigsen.net> Reply-To: jostein@kjonigsen.net Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------TcsAXaMx1zZ5Tkqd6cnXbIF0" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20573"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Cc: 60376@debbugs.gnu.org, Eli Zaretskii To: Yuan Fu , Theodor Thornhill Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jan 01 19:15:23 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 1pC2rj-000598-JY for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 01 Jan 2023 19:15:23 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC2rQ-0006NF-Oa; Sun, 01 Jan 2023 13:15: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 1pC2rP-0006N1-3p for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2023 13:15: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 1pC2rO-0003wT-ND for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2023 13:15:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC2rO-0005Ic-8I for bug-gnu-emacs@gnu.org; Sun, 01 Jan 2023 13:15:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jostein =?UTF-8?Q?Kj=C3=B8nigsen?= Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 01 Jan 2023 18:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60376 X-GNU-PR-Package: emacs Original-Received: via spool by 60376-submit@debbugs.gnu.org id=B60376.167259685520299 (code B ref 60376); Sun, 01 Jan 2023 18:15:02 +0000 Original-Received: (at 60376) by debbugs.gnu.org; 1 Jan 2023 18:14:15 +0000 Original-Received: from localhost ([127.0.0.1]:41709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC2qc-0005HJ-D9 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 13:14:15 -0500 Original-Received: from wout1-smtp.messagingengine.com ([64.147.123.24]:59647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC2qa-0005H7-4m for 60376@debbugs.gnu.org; Sun, 01 Jan 2023 13:14:13 -0500 Original-Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 398A132002E8; Sun, 1 Jan 2023 13:14:06 -0500 (EST) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sun, 01 Jan 2023 13:14:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= secure.kjonigsen.net; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:sender:subject:subject:to:to; s=fm1; t= 1672596845; x=1672683245; bh=dzpfpSCSwI33PW64H+vwaOROU4ZFjPrd06o aFGcMlAA=; b=CXMAGYQSJzu02v7sbEBAB2WlHoI/y+OOHLZ4GfWa3CTxoHTmNBK LxpVfnCQwvSxE9dOsYFowAmiPCjcf/xzqfOmE+RhrlqS2t/ivIXLF4ybhVLd5t16 L+FsRs3OcK31CsICUTe14dv3KRRAEtBrpZvtezwrYtG+26NsiEx2wG/otwEEXjOY QqIxGbe1lNG7KwCNWwS1psiIYEINB63iYtygr3Plgw7JUzpYQ4aEO2xX0SwKqRwT ncxeT1taoB63+niLBM5YCHN2nIaykAxn8zJVCDdPs73VWvTWAlxYfjjwUSnDBHb3 T9V0yX+MMUWWBqepr/O+7eTkB/scISeDf4A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1672596845; x=1672683245; bh=dzpfpSCSwI33P W64H+vwaOROU4ZFjPrd06oaFGcMlAA=; b=FVoTLwQE9teCghxYIeQDFJJmGH1Ox RBL20gkI1wxtQwbstzFPK9XsgItCRv1oSK2NnhcKaVzBP8+h1bawcokpo33YJK/Q Lu0/Ohg82yJV6izimekUf23h5nnaURLKw98doEQEKXcIAIb8bupMIt7+iHjRio88 s2QqkDP4B5A5FhpNWU6LqHiMleJhNlc7UVTstjDDscQCtU3ioMwgvv1g4hQA2FGB gM9uoY4Y/i/6pmGyf4cbv91Zg6UWzadomcxQH//n9gBkHM8p8cgz7b1kapuipJyo R2vhcVEFSonU5JI2p7btv4aNIrzSOJB5bhJz8cwbnA4/qWsPlF019qh4Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrjedtgddutdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurheptgfkffggfghruffhvfevfhgjsehmtderredtfeejnecuhfhrohhmpeflohhs thgvihhnucfmjhppnhhighhsvghnuceojhhoshhtvghinhesshgvtghurhgvrdhkjhhonh highhsvghnrdhnvghtqeenucggtffrrghtthgvrhhnpeeuudffteefieelfffgffeviefh jefgffdvheeukeduhefhjeeitedvgffhudehteenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehjohhsthgvihhnsehsvggtuhhrvgdrkhhjohhn ihhgshgvnhdrnhgvth X-ME-Proxy: Feedback-ID: ib2f84088:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 1 Jan 2023 13:14:04 -0500 (EST) Content-Language: en-GB, nb-NO In-Reply-To: <8538939b-5639-b8c0-82cc-113930a95ab1@secure.kjonigsen.net> 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:252268 Archived-At: This is a multi-part message in MIME format. --------------TcsAXaMx1zZ5Tkqd6cnXbIF0 Content-Type: multipart/alternative; boundary="------------yVI3CU6PNXoM2MqpZMmZPtPO" --------------yVI3CU6PNXoM2MqpZMmZPtPO Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 01.01.2023 18:24, Jostein Kjønigsen wrote: > Disregard previous patch. > > Consider instead please the patch attached to this email. > > It does 3 things all in one: > > * moves function-call fontification to level 4 only (in its own feature) > > * cleans up long-standing issues with "messy" rules for > function-invocations. Removes the needs for "overrides". > > * also fixes issue with fonctification of self/this-method invocations. > > Theo: Can you try this patch and see what you think? > > -- > > Jostein Disregard again (and sorry for the noise!) I've now gone through several files, done quite a bit of testing myself, and found another few issues needing to be solved: * Inconsistent variable-name fontification (sometimes when used, sometimes when declared, sometimes not when used, sometimes not when declared) * Variable declaration with explicit generic types * new() expression fontification for generic types. * Bleeding type-face into brackets for generic return-types in method definitions * Types when casting through as-expressions are not fontified at all. * And more? I've solved those and combined all this into this latest patch, which also moves function-invocation into its own (level 4) feature. This patch should be well beyond the "85%" which Eli has requested for Emacs-29 :) *Theo:* Could you give this a test-spin, and I promise to call it a day? :) -- Jostein --------------yVI3CU6PNXoM2MqpZMmZPtPO Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit On 01.01.2023 18:24, Jostein Kjønigsen wrote:
Disregard previous patch.

Consider instead please the patch attached to this email.

It does 3 things all in one:

* moves function-call fontification to level 4 only (in its own feature)

* cleans up long-standing issues with "messy" rules for function-invocations. Removes the needs for "overrides".

* also fixes issue with fonctification of self/this-method invocations.

Theo: Can you try this patch and see what you think?

--

Jostein

Disregard again (and sorry for the noise!)

I've now gone through several files, done quite a bit of testing myself, and found another few issues needing to be solved:

  • Inconsistent variable-name fontification (sometimes when used, sometimes when declared, sometimes not when used, sometimes not when declared)
  • Variable declaration with explicit generic types
  • new() expression fontification for generic types.
  • Bleeding type-face into brackets for generic return-types in method definitions
  • Types when casting through as-expressions are not fontified at all.
  • And more?

I've solved those and combined all this into this latest patch, which also moves function-invocation into its own (level 4) feature.

This patch should be well beyond the "85%" which Eli has requested for Emacs-29 :)

Theo: Could you give this a test-spin, and I promise to call it a day? :)

--
Jostein

--------------yVI3CU6PNXoM2MqpZMmZPtPO-- --------------TcsAXaMx1zZ5Tkqd6cnXbIF0 Content-Type: text/x-patch; charset=UTF-8; name="0001-lisp-progmodes-csharp-mode.el-adjust-function-call-f.patch" Content-Disposition: attachment; filename*0="0001-lisp-progmodes-csharp-mode.el-adjust-function-call-f.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAzMzM2MDJmZjM0MWI4YThhZGQxNWZmOTYwNTRjZmM1Y2VhMDExNmNkIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/Sm9zdGVpbj0yMEtqPUMzPUI4bmln c2VuPz0gPGpvc3RlaW5Aa2pvbmlnc2VuLm5ldD4KRGF0ZTogU3VuLCAxIEphbiAyMDIzIDE3 OjI3OjA2ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gbGlzcC9wcm9nbW9kZXMvY3NoYXJwLW1v ZGUuZWw6IGFkanVzdCBmdW5jdGlvbi1jYWxsCiBmb250aWZpY2F0aW9uCgotIGVuc3VyZSBt ZXRob2QtaW52b2NhdGlvbnMgYXJlIGhpZ2hsaWdodGVkIG9ubHkgb24gbGV2ZWwgNAotIGVu c3VyZSBjb25zaXN0ZW50IGZvbnRpZmljYXRpb24gb2YgdmFyaWFibGUgZGVjbGFyYXRpb25z CiAgKGRvbid0IGhpZ2hsaWdodCB1c2FnZSBvZiBhbGwgdmFyaWFibGVzKQotIGZpeCBpc3N1 ZXMgd2l0aCBoaWdobGlnaHRpbmcgdHlwZXMgaW4gbmV3KCkgZXhwcmVzc2lvbnMuCi0gZml4 IGlzc3VlcyB3aXRoIGdlbmVyaWMgdHlwZXMgaW4gdmFyaWFibGUtZGVjbGFyYXRpb25zIG5v dCB1c2luZyAidmFyIi4KLSB1c2UgZmV3ZXIsIG1vcmUgZ2VuZXJhbCBxdWVyaWVzIGZvciBm dW5jdGlvbi1pbnZvY2F0aW9ucy4gc2ltcGxpZnkgY29kZS4KLS0tCiBsaXNwL3Byb2dtb2Rl cy9jc2hhcnAtbW9kZS5lbCB8IDY0ICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgMzUgaW5zZXJ0aW9ucygrKSwgMjkgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvbGlzcC9wcm9nbW9kZXMvY3NoYXJwLW1vZGUuZWwgYi9saXNwL3By b2dtb2Rlcy9jc2hhcnAtbW9kZS5lbAppbmRleCBkYTY0ZGFmOTg0OC4uNDczZThmNDlmZDMg MTAwNjQ0Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL2NzaGFycC1tb2RlLmVsCisrKyBiL2xpc3Av cHJvZ21vZGVzL2NzaGFycC1tb2RlLmVsCkBAIC02OTYsNyArNjk2LDcgQEAgY3NoYXJwLXRz LW1vZGUtLWZvbnQtbG9jay1zZXR0aW5ncwogICAgOmZlYXR1cmUgJ2V4cHJlc3Npb24KICAg ICcoKGNvbmRpdGlvbmFsX2V4cHJlc3Npb24gKGlkZW50aWZpZXIpIEBmb250LWxvY2stdmFy aWFibGUtbmFtZS1mYWNlKQogICAgICAocG9zdGZpeF91bmFyeV9leHByZXNzaW9uIChpZGVu dGlmaWVyKSogQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2UpCi0gICAgIChhc3NpZ25t ZW50X2V4cHJlc3Npb24gKGlkZW50aWZpZXIpIEBmb250LWxvY2stdmFyaWFibGUtbmFtZS1m YWNlKSkKKyAgICAgKGluaXRpYWxpemVyX2V4cHJlc3Npb24gKGFzc2lnbm1lbnRfZXhwcmVz c2lvbiBsZWZ0OiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2Up KSkKIAogICAgOmxhbmd1YWdlICdjLXNoYXJwCiAgICA6ZmVhdHVyZSAnYnJhY2tldApAQCAt NzY0LDggKzc2NCwxMiBAQCBjc2hhcnAtdHMtbW9kZS0tZm9udC1sb2NrLXNldHRpbmdzCiAg ICAgICAoaWRlbnRpZmllcikgQGZvbnQtbG9jay10eXBlLWZhY2UpCiAgICAgICh0eXBlX2Fy Z3VtZW50X2xpc3QKICAgICAgIChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXR5cGUtZmFjZSkK LSAgICAgKGdlbmVyaWNfbmFtZQotICAgICAgKGlkZW50aWZpZXIpIEBmb250LWxvY2stdHlw ZS1mYWNlKQorICAgICAodHlwZV9hcmd1bWVudF9saXN0CisgICAgICAoZ2VuZXJpY19uYW1l CisgICAgICAgKGlkZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlKSkKKyAgICAgKGJh c2VfbGlzdAorICAgICAgKGdlbmVyaWNfbmFtZQorICAgICAgIChpZGVudGlmaWVyKSBAZm9u dC1sb2NrLXR5cGUtZmFjZSkpCiAgICAgIChhcnJheV90eXBlCiAgICAgICAoaWRlbnRpZmll cikgQGZvbnQtbG9jay10eXBlLWZhY2UpCiAgICAgIChjYXN0X2V4cHJlc3Npb24gKGlkZW50 aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlKQpAQCAtNzczLDcgKzc3NywxMiBAQCBjc2hh cnAtdHMtbW9kZS0tZm9udC1sb2NrLXNldHRpbmdzCiAgICAgICh0eXBlX3BhcmFtZXRlcl9j b25zdHJhaW50c19jbGF1c2UKICAgICAgIHRhcmdldDogKGlkZW50aWZpZXIpIEBmb250LWxv Y2stdHlwZS1mYWNlKQogICAgICAodHlwZV9vZl9leHByZXNzaW9uIChpZGVudGlmaWVyKSBA Zm9udC1sb2NrLXR5cGUtZmFjZSkKLSAgICAgKG9iamVjdF9jcmVhdGlvbl9leHByZXNzaW9u IChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXR5cGUtZmFjZSkpCisgICAgIChvYmplY3RfY3Jl YXRpb25fZXhwcmVzc2lvbgorICAgICAgdHlwZTogKGlkZW50aWZpZXIpIEBmb250LWxvY2st dHlwZS1mYWNlKQorICAgICAob2JqZWN0X2NyZWF0aW9uX2V4cHJlc3Npb24KKyAgICAgIHR5 cGU6IChnZW5lcmljX25hbWUgKGlkZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlKSkK KyAgICAgKGFzX2V4cHJlc3Npb24gcmlnaHQ6IChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXR5 cGUtZmFjZSkKKyAgICAgKGFzX2V4cHJlc3Npb24gcmlnaHQ6IChnZW5lcmljX25hbWUgKGlk ZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlKSkpCiAKICAgIDpsYW5ndWFnZSAnYy1z aGFycAogICAgOmZlYXR1cmUgJ2RlZmluaXRpb24KQEAgLTc5Myw3ICs4MDIsNiBAQCBjc2hh cnAtdHMtbW9kZS0tZm9udC1sb2NrLXNldHRpbmdzCiAgICAgIChyZWNvcmRfZGVjbGFyYXRp b24gKGlkZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlKQogICAgICAobmFtZXNwYWNl X2RlY2xhcmF0aW9uIChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXR5cGUtZmFjZSkKICAgICAg KGJhc2VfbGlzdCAoaWRlbnRpZmllcikgQGZvbnQtbG9jay10eXBlLWZhY2UpCi0gICAgIChw cm9wZXJ0eV9kZWNsYXJhdGlvbiAoZ2VuZXJpY19uYW1lKSkKICAgICAgKHByb3BlcnR5X2Rl Y2xhcmF0aW9uCiAgICAgICB0eXBlOiAobnVsbGFibGVfdHlwZSkgQGZvbnQtbG9jay10eXBl LWZhY2UKICAgICAgIG5hbWU6IChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXZhcmlhYmxlLW5h bWUtZmFjZSkKQEAgLTgwNywyOSArODE1LDEwIEBAIGNzaGFycC10cy1tb2RlLS1mb250LWxv Y2stc2V0dGluZ3MKIAogICAgICAoY29uc3RydWN0b3JfZGVjbGFyYXRpb24gbmFtZTogKF8p IEBmb250LWxvY2stdHlwZS1mYWNlKQogCi0gICAgIChtZXRob2RfZGVjbGFyYXRpb24gdHlw ZTogKF8pIEBmb250LWxvY2stdHlwZS1mYWNlKQorICAgICAobWV0aG9kX2RlY2xhcmF0aW9u IHR5cGU6IFsoaWRlbnRpZmllcikgKHZvaWRfa2V5d29yZCldIEBmb250LWxvY2stdHlwZS1m YWNlKQorICAgICAobWV0aG9kX2RlY2xhcmF0aW9uIHR5cGU6IChnZW5lcmljX25hbWUgKGlk ZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlKSkKICAgICAgKG1ldGhvZF9kZWNsYXJh dGlvbiBuYW1lOiAoXykgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpCiAKLSAgICAg KGludm9jYXRpb25fZXhwcmVzc2lvbgotICAgICAgKG1lbWJlcl9hY2Nlc3NfZXhwcmVzc2lv bgotICAgICAgIChnZW5lcmljX25hbWUgKGlkZW50aWZpZXIpIEBmb250LWxvY2stZnVuY3Rp b24tbmFtZS1mYWNlKSkpCi0gICAgIChpbnZvY2F0aW9uX2V4cHJlc3Npb24KLSAgICAgICht ZW1iZXJfYWNjZXNzX2V4cHJlc3Npb24KLSAgICAgICAoKGlkZW50aWZpZXIpIEBmb250LWxv Y2stdmFyaWFibGUtbmFtZS1mYWNlCi0gICAgICAgIChpZGVudGlmaWVyKSBAZm9udC1sb2Nr LWZ1bmN0aW9uLW5hbWUtZmFjZSkpKQotICAgICAoaW52b2NhdGlvbl9leHByZXNzaW9uCi0g ICAgICAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpCi0gICAg IChpbnZvY2F0aW9uX2V4cHJlc3Npb24KLSAgICAgIChtZW1iZXJfYWNjZXNzX2V4cHJlc3Np b24KLSAgICAgICBleHByZXNzaW9uOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay12YXJpYWJs ZS1uYW1lLWZhY2UpKQotICAgICAoaW52b2NhdGlvbl9leHByZXNzaW9uCi0gICAgICBmdW5j dGlvbjogWyhnZW5lcmljX25hbWUgKGlkZW50aWZpZXIpKSBAZm9udC1sb2NrLWZ1bmN0aW9u LW5hbWUtZmFjZQotICAgICAgICAgICAgICAgICAoZ2VuZXJpY19uYW1lICh0eXBlX2FyZ3Vt ZW50X2xpc3QKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgWyI8Il0gQGZvbnQt bG9jay1icmFja2V0LWZhY2UKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGlk ZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFsiPiJdIEBmb250LWxvY2stYnJhY2tldC1mYWNlKQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICldKQotCiAgICAgIChjYXRjaF9kZWNsYXJhdGlvbgogICAg ICAgKChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXR5cGUtZmFjZSkpCiAgICAgIChjYXRjaF9k ZWNsYXJhdGlvbgpAQCAtODM3LDEzICs4MjYsMzAgQEAgY3NoYXJwLXRzLW1vZGUtLWZvbnQt bG9jay1zZXR0aW5ncwogICAgICAgIChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXZhcmlhYmxl LW5hbWUtZmFjZSkpCiAKICAgICAgKHZhcmlhYmxlX2RlY2xhcmF0aW9uIChpZGVudGlmaWVy KSBAZm9udC1sb2NrLXR5cGUtZmFjZSkKKyAgICAgKHZhcmlhYmxlX2RlY2xhcmF0aW9uIChn ZW5lcmljX25hbWUgKGlkZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlKSkKICAgICAg KHZhcmlhYmxlX2RlY2xhcmF0b3IgKGlkZW50aWZpZXIpIEBmb250LWxvY2stdmFyaWFibGUt bmFtZS1mYWNlKQogCiAgICAgIChwYXJhbWV0ZXIgdHlwZTogKGlkZW50aWZpZXIpIEBmb250 LWxvY2stdHlwZS1mYWNlKQorICAgICAocGFyYW1ldGVyIHR5cGU6IChnZW5lcmljX25hbWUg KGlkZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlKSkKICAgICAgKHBhcmFtZXRlciBu YW1lOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2UpCiAKLSAg ICAgKGJpbmFyeV9leHByZXNzaW9uIChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXZhcmlhYmxl LW5hbWUtZmFjZSkKLSAgICAgKGFyZ3VtZW50IChpZGVudGlmaWVyKSBAZm9udC1sb2NrLXZh cmlhYmxlLW5hbWUtZmFjZSkpCisgICAgIChsYW1iZGFfZXhwcmVzc2lvbiAoaWRlbnRpZmll cikgQGZvbnQtbG9jay12YXJpYWJsZS1uYW1lLWZhY2UpCisKKyAgICAgKGRlY2xhcmF0aW9u X2V4cHJlc3Npb24gdHlwZTogKGlkZW50aWZpZXIpIEBmb250LWxvY2stdHlwZS1mYWNlKQor ICAgICAoZGVjbGFyYXRpb25fZXhwcmVzc2lvbiBuYW1lOiAoaWRlbnRpZmllcikgQGZvbnQt bG9jay12YXJpYWJsZS1uYW1lLWZhY2UpKQorCisgICA6bGFuZ3VhZ2UgJ2Mtc2hhcnAKKyAg IDpmZWF0dXJlICdmdW5jdGlvbgorICAgJygoaW52b2NhdGlvbl9leHByZXNzaW9uCisgICAg ICBmdW5jdGlvbjogKG1lbWJlcl9hY2Nlc3NfZXhwcmVzc2lvbgorICAgICAgICAgICAgICAg ICBuYW1lOiAoaWRlbnRpZmllcikgQGZvbnQtbG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpKQor ICAgICAoaW52b2NhdGlvbl9leHByZXNzaW9uCisgICAgICBmdW5jdGlvbjogKGlkZW50aWZp ZXIpIEBmb250LWxvY2stZnVuY3Rpb24tbmFtZS1mYWNlKQorICAgICAoaW52b2NhdGlvbl9l eHByZXNzaW9uCisgICAgICBmdW5jdGlvbjogKG1lbWJlcl9hY2Nlc3NfZXhwcmVzc2lvbgor ICAgICAgICAgICAgICAgICBuYW1lOiAoZ2VuZXJpY19uYW1lIChpZGVudGlmaWVyKSBAZm9u dC1sb2NrLWZ1bmN0aW9uLW5hbWUtZmFjZSkpKQorICAgICAoaW52b2NhdGlvbl9leHByZXNz aW9uCisgICAgICBmdW5jdGlvbjogKGdlbmVyaWNfbmFtZSAoaWRlbnRpZmllcikgQGZvbnQt bG9jay1mdW5jdGlvbi1uYW1lLWZhY2UpKSkKIAogICAgOmxhbmd1YWdlICdjLXNoYXJwCiAg ICA6ZmVhdHVyZSAnZXNjYXBlLXNlcXVlbmNlCkBAIC05MTYsNyArOTIyLDcgQEAgY3NoYXJw LXRzLW1vZGUKICAgICAgICAgICAgICAgJygoIGNvbW1lbnQgZGVmaW5pdGlvbikKICAgICAg ICAgICAgICAgICAoIGtleXdvcmQgc3RyaW5nIHR5cGUpCiAgICAgICAgICAgICAgICAgKCBj b25zdGFudCBlc2NhcGUtc2VxdWVuY2UgZXhwcmVzc2lvbiBsaXRlcmFsIHByb3BlcnR5KQot ICAgICAgICAgICAgICAgICggYnJhY2tldCBkZWxpbWl0ZXIgZXJyb3IpKSkKKyAgICAgICAg ICAgICAgICAoIGZ1bmN0aW9uIGJyYWNrZXQgZGVsaW1pdGVyIGVycm9yKSkpCiAKICAgOzsg SW1lbnUuCiAgIChzZXRxLWxvY2FsIHRyZWVzaXQtc2ltcGxlLWltZW51LXNldHRpbmdzCi0t IAoyLjM3LjIKCg== --------------TcsAXaMx1zZ5Tkqd6cnXbIF0--