(chore) add `name` attribute to all language grammars #2407

taufik-nurrohman · 2020-02-17T15:16:45Z

Related: #2400

joshgoebel

Also please remove the extra changelog file you seemed to add.

joshgoebel · 2020-02-17T21:07:43Z

src/languages/c-like.js

@@ -197,6 +197,7 @@ export default function(hljs) {
  };

  return {
+    name: 'C-like',


This is just a foundation. No name needed.

joshgoebel · 2020-02-17T21:08:35Z

src/languages/apache.js

@@ -19,7 +19,8 @@ export default function(hljs) {
    begin: ":\\d{1,5}"
  };
  return {
-    aliases: ['apacheconf'],
+    name: 'Apache',


Please add “config” to match the title.

joshgoebel · 2020-02-17T21:14:53Z

src/languages/julia.js

@@ -86,6 +86,7 @@ export default function(hljs) {

  // placeholder for recursive self-reference
  var DEFAULT = {
+    name: 'Julia',


This needs to go in the return block not default.

src/languages/pf.js

src/languages/yaml.js

joshgoebel · 2020-02-17T21:24:09Z

Very nice work. Thanks for the contribution.

joshgoebel · 2020-02-17T23:46:40Z

You really should rebase this on master though. I meant I can work with this, but for future contributions the PR will be MUCH nicer and easier to review if you're starting from a clean master.

taufik-nurrohman · 2020-02-18T12:07:05Z

Also please remove the extra changelog file you seemed to add.

Done? Huh? Where am I now?

taufik-nurrohman · 2020-02-18T12:17:27Z

You really should rebase this on master though. I meant I can work with this, but for future contributions the PR will be MUCH nicer and easier to review if you're starting from a clean master.

My first intention was that I wanted to merge this commit onto your branch in yyyc514:lang_has_name. But I just didn’t know how it worked.

Wow, this project is so crowded. I feel lost sometimes.

joshgoebel · 2020-02-18T12:19:23Z

lang_has_name is in master now and this commit chain is just crazy.

You should hard reset your own master to upstream master and then cherry-pick your 2 commits back on top. (that's easiest if you don't know how to do the rebase)

joshgoebel · 2020-02-18T12:22:57Z

Wow, this project is so crowded. I feel lost sometimes.

Sorry Git and Github can be a real pain if you aren't familiar with them. Have you been merging upstream master into your master (while also committing to your master)? That is bad mojo and will cause you all sorts of problems.

This might be of interest:

https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history

taufik-nurrohman · 2020-02-18T14:10:09Z

Sorry Git and Github can be a real pain if you aren't familiar with them.

Have been using it for my personal project but never used it to collaborate with others.

Have you been merging upstream master into your master (while also committing to your master)?

That was from my previous pull request. I didn’t delete that repository after my pull has been merged and just continue creating a branch named patch-1.

The commit log data in my patch-1 branch is mixed with yours. Is that normal?

joshgoebel · 2020-02-18T14:48:23Z

That was from my previous pull request. I didn’t delete that repository after my pull has been merged and just continue creating a branch named patch-1.

Yeah that's how you get everything messed up. Because the final merge of anything often isn't the same as what's in a PR... so now your history has diverged from upstream master and you start seeing everything twice... to avoid that your master should always be pinned to upstream master.

You can fix it by a hard reset:

# make sure upstream is a remote
git remote add upstream git@github.com:highlightjs/highlight.js.git
# checkout your master branch
git checkout master 
# force reset your master to point to the SAME exact commit as upstream/master
git reset --hard upstream/master

That's just to "fix" master... you should always do your work in branches and NEVER commit to master (when contributing to projects). If you keep your master clean then all you have to do is switch to it periodically and merge upstream:

git checkout master
git merge upstream/master

Once you have your master sane again you can switch to your branch, hard-reset IT to master also and then cherry-pick the two commits you want to get them back. Make sure you write down the commit hashes first (or you can always use git reflog to find them). Or you could do an interactive rebase onto master...

joshgoebel · 2020-02-20T12:12:51Z

If that's' too much let me know and I can probably finish this up myself.

taufik-nurrohman · 2020-02-21T12:12:58Z

Doh, sorry for that extensions part. I should move that to another pull. Please wait.

…to patch-1

joshgoebel requested changes Feb 17, 2020

View reviewed changes

joshgoebel changed the title ~~Added name Attribute(s)~~ (chore) add name attribute to all language grammars Feb 18, 2020

joshgoebel added language parser enhancement An enhancement or new feature labels Feb 18, 2020

taufik-nurrohman force-pushed the patch-1 branch from b6b85af to 3c8f550 Compare February 18, 2020 12:05

taufik-nurrohman added 2 commits February 21, 2020 19:03

Update

99ecdaa

Added name Attribute

9822095

taufik-nurrohman force-pushed the patch-1 branch from 3c8f550 to 9822095 Compare February 21, 2020 12:09

joshgoebel added 4 commits February 21, 2020 21:19

small fixes

60e8971

Merge branch 'master' into patch-1

5494ca0

fix

ff87059

Merge branch 'patch-1' of github.com:taufik-nurrohman/highlight.js in…

33b19be

…to patch-1

joshgoebel approved these changes Feb 22, 2020

View reviewed changes

joshgoebel merged commit 5dcc628 into highlightjs:master Feb 22, 2020

Greg-Smulko mentioned this pull request Sep 22, 2020

Add name of the grammar & website highlightjs/highlightjs-tsql#3

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(chore) add `name` attribute to all language grammars #2407

(chore) add `name` attribute to all language grammars #2407

taufik-nurrohman commented Feb 17, 2020 •

edited by joshgoebel

joshgoebel left a comment

joshgoebel Feb 17, 2020

joshgoebel Feb 17, 2020

joshgoebel Feb 17, 2020

joshgoebel commented Feb 17, 2020

joshgoebel commented Feb 17, 2020

taufik-nurrohman commented Feb 18, 2020

taufik-nurrohman commented Feb 18, 2020 •

edited

joshgoebel commented Feb 18, 2020

joshgoebel commented Feb 18, 2020 •

edited

taufik-nurrohman commented Feb 18, 2020 •

edited

joshgoebel commented Feb 18, 2020 •

edited

joshgoebel commented Feb 20, 2020

taufik-nurrohman commented Feb 21, 2020

(chore) add name attribute to all language grammars #2407

(chore) add name attribute to all language grammars #2407

Conversation

taufik-nurrohman commented Feb 17, 2020 • edited by joshgoebel

joshgoebel left a comment

Choose a reason for hiding this comment

joshgoebel Feb 17, 2020

Choose a reason for hiding this comment

joshgoebel Feb 17, 2020

Choose a reason for hiding this comment

joshgoebel Feb 17, 2020

Choose a reason for hiding this comment

joshgoebel commented Feb 17, 2020

joshgoebel commented Feb 17, 2020

taufik-nurrohman commented Feb 18, 2020

taufik-nurrohman commented Feb 18, 2020 • edited

joshgoebel commented Feb 18, 2020

joshgoebel commented Feb 18, 2020 • edited

taufik-nurrohman commented Feb 18, 2020 • edited

joshgoebel commented Feb 18, 2020 • edited

joshgoebel commented Feb 20, 2020

taufik-nurrohman commented Feb 21, 2020

(chore) add `name` attribute to all language grammars #2407

(chore) add `name` attribute to all language grammars #2407

taufik-nurrohman commented Feb 17, 2020 •

edited by joshgoebel

taufik-nurrohman commented Feb 18, 2020 •

edited

joshgoebel commented Feb 18, 2020 •

edited

taufik-nurrohman commented Feb 18, 2020 •

edited

joshgoebel commented Feb 18, 2020 •

edited