From 69c756827433a6ef68299eca6eb0581165adb610 Mon Sep 17 00:00:00 2001 From: Alhadis Date: Wed, 4 Jan 2017 11:52:09 +1100 Subject: [PATCH] Fix match priority of "docker-compose.yml" files Resolves #489. --- CHANGELOG.md | 2 ++ config.cson | 2 +- docker-compose.yml | 0 lib/icons/.icondb.js | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 docker-compose.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index b663a8ea..c37bab21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). -------------------- ### Fixed - [[`#483`][]] Wrong colour used for `_spec.rb` files +- [[`#489`][]] Wrong icon used for Dockerfiles [`#483`]: https://github.com/DanBrooker/file-icons/issues/483 +[`#489`]: https://github.com/DanBrooker/file-icons/issues/489 [2.0.4] - 2017-01-02 diff --git a/config.cson b/config.cson index d3ff8576..27de700a 100644 --- a/config.cson +++ b/config.cson @@ -972,7 +972,7 @@ fileIcons: Docker: icon: "docker" match: [ - [/^(Dockerfile|docker-compose)|\.docker(file|ignore)$/i, "dark-blue", scope: "dockerfile"] + [/^(Dockerfile|docker-compose)|\.docker(file|ignore)$/i, "dark-blue", scope: "dockerfile", priority: 2] [/^docker-sync\.yml$/i, "dark-orange", priority: 2] ] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..e69de29b diff --git a/lib/icons/.icondb.js b/lib/icons/.icondb.js index 1e29e05c..3f3242d3 100644 --- a/lib/icons/.icondb.js +++ b/lib/icons/.icondb.js @@ -57,6 +57,7 @@ module.exports = [ ["d3-icon",["medium-orange","medium-orange"],/^d3(?:\.v\d+)?[^.]*\.js$/i], ["database-icon",["medium-red","medium-red"],/^METADATA\.pb$/], ["database-icon",["medium-red","medium-red"],/\.git[\/\\](?:.*[\/\\])?(?:HEAD|ORIG_HEAD|packed-refs|logs[\/\\](?:.+[\/\\])?[^\/\\]+)$/,true], +["docker-icon",["dark-blue","dark-blue"],/^(?:Dockerfile|docker-compose)|\.docker(?:file|ignore)$/i,false,,/\.dockerfile$/i,/^Docker$/i], ["docker-icon",["dark-orange","dark-orange"],/^docker-sync\.yml$/i], ["dojo-icon",["light-red","light-red"],/^dojo\.js$/i], ["ember-icon",["medium-red","medium-red"],/^ember(?:\.|(?:-[^.]+)?-(?:\d+\.)+(?:debug\.)?)js$/i], @@ -343,7 +344,6 @@ module.exports = [ ["earth-icon",["medium-blue","medium-blue"],/\.zone$/i], ["earth-icon",["medium-green","medium-green"],/\.arpa$/i], ["earth-icon",["dark-blue","dark-blue"],/^CNAME$/], -["docker-icon",["dark-blue","dark-blue"],/^(?:Dockerfile|docker-compose)|\.docker(?:file|ignore)$/i,false,,/\.dockerfile$/i,/^Docker$/i], ["doxygen-icon",["medium-blue","medium-blue"],/^Doxyfile$/,false,,/\.doxygen$/i,/^Doxyfile$/i], ["dyalog-icon",["medium-orange","medium-orange"],/\.dyalog$/i,false,/^dyalog$/], ["dylib-icon",["medium-cyan","medium-cyan"],/\.(?:dylib|bundle)$/i], @@ -1077,5 +1077,5 @@ module.exports = [ ["book-icon",["dark-blue","dark-blue"],/^news(?:[-_.]?[-\d]+)?$/i], ["v8-icon",["medium-blue","medium-blue"],/^(?:[dv]8|v8[-_.][^.]*|mksnapshot|mkpeephole)$/i], ["terminal-icon",["medium-purple","medium-purple"],/rc/i]], -[[68,145,150,152,167,190,193,194,195,196,202,215,237,242,247,249,251,256,285,290,291,301,302,307,330,332,335,342,346,352,361,379,394,397,415,419,420,421,423,430,433,447,450,464,466,467,470,479,480,481,484,485,523,524,527,532,553,563,568,569,570,576,578,582,584,588,599,600,624,627,656,667,668,679,686,692,694,707,712,713,743,746,753,758,767,770,776,777,796,798,801,803,806,809,820,821,824,834,836,846,852,856,858,862,863,865,866,869,879,884,901,917,921,929,937,980,993,996,998,1016],[56,68,104,118,119,122,124,127,141,143,145,147,149,150,152,154,155,156,164,165,167,172,190,192,193,194,195,196,202,204,208,209,211,213,214,215,221,222,223,227,228,232,234,235,236,237,240,241,242,247,249,251,253,254,256,273,283,284,285,286,288,289,290,291,292,293,295,298,299,301,302,307,310,312,324,328,329,335,340,341,342,345,346,349,350,351,352,358,361,364,379,380,381,382,385,389,391,393,394,397,399,415,421,438,439,441,447,450,451,452,453,457,460,462,464,465,466,467,468,469,470,471,472,473,474,478,481,484,485,486,487,488,520,522,523,525,527,528,531,532,541,544,545,546,547,551,553,556,558,559,563,568,569,573,576,578,580,582,584,588,598,599,600,601,602,603,610,616,624,627,655,656,662,663,666,667,673,676,677,678,679,683,685,686,687,688,689,692,694,702,705,707,712,713,714,715,716,717,732,736,739,740,742,744,745,746,751,753,758,766,767,772,774,775,776,777,779,790,795,796,799,800,801,803,805,806,809,816,820,821,824,825,826,827,834,836,839,843,845,846,848,852,856,858,860,861,862,863,865,866,869,873,879,882,884,892,894,895,896,898,899,901,903,908,916,917,921,925,926,929,930,931,937,940,944,945,947,963,975,976,977,978,979,980,988,990,993,995,996,998,1016,1018,1027,1029,1032,1046,1047,1048,1056],[41,148,280,281,282,319,887,952],[56,68,104,118,119,122,124,127,141,143,145,147,149,150,152,154,155,156,164,165,167,172,190,192,193,194,195,196,202,204,208,209,211,213,214,215,221,222,223,227,228,232,234,235,236,237,240,241,242,247,249,251,253,254,256,273,274,283,284,285,286,288,289,290,291,292,293,295,298,299,301,302,307,309,310,312,317,324,328,329,335,340,341,342,345,346,349,350,351,352,358,361,364,379,380,381,382,385,389,391,393,394,397,399,411,415,417,419,420,421,423,430,431,433,438,439,441,447,450,451,452,453,457,460,462,464,465,466,467,468,469,470,471,472,473,474,478,479,480,481,482,484,485,486,487,488,520,522,523,525,527,528,531,532,541,544,545,546,547,551,553,556,558,559,563,568,569,573,576,578,580,582,584,588,598,599,600,601,602,603,610,616,624,627,655,656,658,659,662,663,666,667,673,676,677,678,679,683,685,686,687,688,689,692,694,702,705,707,712,713,714,715,716,717,732,736,739,740,742,744,745,746,751,753,758,766,767,772,774,775,776,777,779,790,795,796,799,800,801,803,805,806,809,816,820,821,824,825,826,827,834,836,839,843,845,846,848,852,856,858,860,861,862,863,865,866,869,873,874,879,882,884,892,894,895,896,898,899,901,903,908,916,917,921,925,926,929,930,931,937,940,944,945,947,963,975,976,977,978,979,980,988,990,993,995,996,998,1016,1018,1027,1029,1032,1046,1047,1048,1056],[105,136,176,177,178,179,180,181,182,183,184,186,187,233,259,260,261,262,263,266,271,347,371,372,373,374,375,376,409,410,491,492,493,494,495,496,497,498,499,501,502,503,504,505,507,508,509,510,511,512,514,517,518,599,672,735,752,767,779,950,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015]]] +[[69,146,151,153,168,191,194,195,196,197,203,216,238,243,248,250,252,257,286,291,292,302,303,308,330,332,335,342,346,352,361,379,394,397,415,419,420,421,423,430,433,447,450,464,466,467,470,479,480,481,484,485,523,524,527,532,553,563,568,569,570,576,578,582,584,588,599,600,624,627,656,667,668,679,686,692,694,707,712,713,743,746,753,758,767,770,776,777,796,798,801,803,806,809,820,821,824,834,836,846,852,856,858,862,863,865,866,869,879,884,901,917,921,929,937,980,993,996,998,1016],[42,57,69,105,119,120,123,125,128,142,144,146,148,150,151,153,155,156,157,165,166,168,173,191,193,194,195,196,197,203,205,209,210,212,214,215,216,222,223,224,228,229,233,235,236,237,238,241,242,243,248,250,252,254,255,257,274,284,285,286,287,289,290,291,292,293,294,296,299,300,302,303,308,311,313,325,329,335,340,341,342,345,346,349,350,351,352,358,361,364,379,380,381,382,385,389,391,393,394,397,399,415,421,438,439,441,447,450,451,452,453,457,460,462,464,465,466,467,468,469,470,471,472,473,474,478,481,484,485,486,487,488,520,522,523,525,527,528,531,532,541,544,545,546,547,551,553,556,558,559,563,568,569,573,576,578,580,582,584,588,598,599,600,601,602,603,610,616,624,627,655,656,662,663,666,667,673,676,677,678,679,683,685,686,687,688,689,692,694,702,705,707,712,713,714,715,716,717,732,736,739,740,742,744,745,746,751,753,758,766,767,772,774,775,776,777,779,790,795,796,799,800,801,803,805,806,809,816,820,821,824,825,826,827,834,836,839,843,845,846,848,852,856,858,860,861,862,863,865,866,869,873,879,882,884,892,894,895,896,898,899,901,903,908,916,917,921,925,926,929,930,931,937,940,944,945,947,963,975,976,977,978,979,980,988,990,993,995,996,998,1016,1018,1027,1029,1032,1046,1047,1048,1056],[41,149,281,282,283,320,887,952],[42,57,69,105,119,120,123,125,128,142,144,146,148,150,151,153,155,156,157,165,166,168,173,191,193,194,195,196,197,203,205,209,210,212,214,215,216,222,223,224,228,229,233,235,236,237,238,241,242,243,248,250,252,254,255,257,274,275,284,285,286,287,289,290,291,292,293,294,296,299,300,302,303,308,310,311,313,318,325,329,335,340,341,342,345,346,349,350,351,352,358,361,364,379,380,381,382,385,389,391,393,394,397,399,411,415,417,419,420,421,423,430,431,433,438,439,441,447,450,451,452,453,457,460,462,464,465,466,467,468,469,470,471,472,473,474,478,479,480,481,482,484,485,486,487,488,520,522,523,525,527,528,531,532,541,544,545,546,547,551,553,556,558,559,563,568,569,573,576,578,580,582,584,588,598,599,600,601,602,603,610,616,624,627,655,656,658,659,662,663,666,667,673,676,677,678,679,683,685,686,687,688,689,692,694,702,705,707,712,713,714,715,716,717,732,736,739,740,742,744,745,746,751,753,758,766,767,772,774,775,776,777,779,790,795,796,799,800,801,803,805,806,809,816,820,821,824,825,826,827,834,836,839,843,845,846,848,852,856,858,860,861,862,863,865,866,869,873,874,879,882,884,892,894,895,896,898,899,901,903,908,916,917,921,925,926,929,930,931,937,940,944,945,947,963,975,976,977,978,979,980,988,990,993,995,996,998,1016,1018,1027,1029,1032,1046,1047,1048,1056],[106,137,177,178,179,180,181,182,183,184,185,187,188,234,260,261,262,263,264,267,272,347,371,372,373,374,375,376,409,410,491,492,493,494,495,496,497,498,499,501,502,503,504,505,507,508,509,510,511,512,514,517,518,599,672,735,752,767,779,950,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015]]] ];