Module:Diff/sandbox - Revision history

Jonesey95: If we are going to support blocks, let's start both blocks at the top of the table cell.

2024-11-16T14:05:14Z

If we are going to support blocks, let's start both blocks at the top of the table cell.

← Previous revision		Revision as of 14:05, 16 November 2024
Line 213:		Line 213:
	local tdDivStyle = 'word-wrap: break-word; direction: ltr;'		local tdDivStyle = 'word-wrap: break-word; direction: ltr;'

	local tdSharedStyle = 'width: 48%; border-style: solid; border-radius: 0.33em; ' ..		local tdSharedStyle = 'vertical-align:top; width: 48%; border-style: solid; border-radius: 0.33em; ' ..
	'padding: 0.33em 0.5em; color: inherit; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..		'padding: 0.33em 0.5em; color: inherit; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..
	'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..		'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..

Johnuniq: fix indents to use standard tabs: revert if this complicates diffs too much

2024-11-16T03:47:30Z

fix indents to use standard tabs: revert if this complicates diffs too much

Show changes

Johnuniq: author per current c:Module:Diff; remove trailing whitespace

2024-11-16T02:21:24Z

author per current c:Module:Diff; remove trailing whitespace

← Previous revision		Revision as of 02:21, 16 November 2024
Line 4:		Line 4:
	-- (c) 2007, 2008 Yuri Takhteyev ([email protected])		-- (c) 2007, 2008 Yuri Takhteyev ([email protected])
	-- (c) 2007 Hisham Muhammad		-- (c) 2007 Hisham Muhammad
	-- Adapted to MediaWiki ~~LUA:~~ [[User:~~Ebraminio]] <ebrahim -at- gnu.org>~~		-- Adapted to MediaWiki Lua originally by User:Ebrahim
	--		--
	-- License: MIT/X, see http://sputnik.freewisdom.org/en/License		-- License: MIT/X, see http://sputnik.freewisdom.org/en/License
Line 23:		Line 23:
	-- @param separator [optional] the separator pattern (defaults to any		-- @param separator [optional] the separator pattern (defaults to any
	-- whitespace - %s+).		-- whitespace - %s+).
	-- @param skip_separator [optional] don't include the separator in the results.		-- @param skip_separator [optional] don't include the separator in the results.
	-- @return A list of tokens.		-- @return A list of tokens.
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
	local function split(text, separator, skip_separator)		local function split(text, separator, skip_separator)
	separator = separator or "%s+"		separator = separator or "%s+"
	local parts = {}		local parts = {}
	local start = 1		local start = 1
	local split_start, split_end = mw.ustring.find(text, separator, start)		local split_start, split_end = mw.ustring.find(text, separator, start)
Line 48:		Line 48:
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
	-- Derives the longest common subsequence of two strings. This is a faster		-- Derives the longest common subsequence of two strings. This is a faster
	-- implementation than one provided by stdlib. Submitted by Hisham Muhammad.		-- implementation than one provided by stdlib. Submitted by Hisham Muhammad.
	-- The algorithm was taken from:		-- The algorithm was taken from:
	-- http://en.wikibooks.org/wiki/Algorithm_implementation/Strings/Longest_common_subsequence		-- http://en.wikibooks.org/wiki/Algorithm_implementation/Strings/Longest_common_subsequence
Line 97:		Line 97:
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
	-- Formats an inline diff as HTML, with <ins> and <del> tags.		-- Formats an inline diff as HTML, with <ins> and <del> tags.
	--		--
	-- @param tokens a table of {token, status} pairs.		-- @param tokens a table of {token, status} pairs.
	-- @return an HTML string.		-- @return an HTML string.
Line 111:		Line 111:
	elseif status == "out" then		elseif status == "out" then
	diff_buffer = diff_buffer..'<del>'..token..'</del>'		diff_buffer = diff_buffer..'<del>'..token..'</del>'
	else		else
	diff_buffer = diff_buffer..token		diff_buffer = diff_buffer..token
	end		end

Aidan9382: Fix? maybe??

2024-11-15T08:12:42Z

Fix? maybe??

← Previous revision		Revision as of 08:12, 15 November 2024
Line 235:		Line 235:

	for i, token_record in ipairs(tokens) do		for i, token_record in ipairs(tokens) do
	token = mw.text.nowiki(token_record[1])		token = mw.text.nowiki(token_record[1]):gsub("\n", " ") -- Force all newlines to encode to avoid linter issues
	status = token_record[2]		status = token_record[2]
	if status == OUT then		if status == OUT then
Line 261:		Line 261:

	for i, token_record in ipairs(tokens) do		for i, token_record in ipairs(tokens) do
	token = mw.text.nowiki(token_record[1])		token = mw.text.nowiki(token_record[1]):gsub("\n", " ") -- Force all newlines to encode to avoid linter issues
	status = token_record[2]		status = token_record[2]
	if status == IN then		if status == IN then

Jonesey95: Undid revision 1257468193 by Jonesey95 (talk). back to live version

2024-11-15T01:49:16Z

Undid revision 1257468193 by Jonesey95 (talk). back to live version

← Previous revision		Revision as of 01:49, 15 November 2024
Line 242:		Line 242:
	:cssText('background: var(--background-color-content-removed,#ffe49c); color: inherit; ' .. insDelSharedStyle)		:cssText('background: var(--background-color-content-removed,#ffe49c); color: inherit; ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
			:addClass('diffchange-inline')
	:wikitext(token)		:wikitext(token)
	elseif status == SAME then		elseif status == SAME then
Line 267:		Line 268:
	:cssText('background: var(--background-color-content-added,#a3d3ff); color: inherit; ' .. insDelSharedStyle)		:cssText('background: var(--background-color-content-added,#a3d3ff); color: inherit; ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
			:addClass('diffchange-inline')
	:wikitext(token)		:wikitext(token)
	elseif status == SAME then		elseif status == SAME then

Jonesey95: rm inline (experiment)

2024-11-15T01:22:35Z

rm inline (experiment)

← Previous revision		Revision as of 01:22, 15 November 2024
Line 242:		Line 242:
	:cssText('background: var(--background-color-content-removed,#ffe49c); color: inherit; ' .. insDelSharedStyle)		:cssText('background: var(--background-color-content-removed,#ffe49c); color: inherit; ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
	:addClass('diffchange-inline')
	:wikitext(token)		:wikitext(token)
	elseif status == SAME then		elseif status == SAME then
Line 268:		Line 267:
	:cssText('background: var(--background-color-content-added,#a3d3ff); color: inherit; ' .. insDelSharedStyle)		:cssText('background: var(--background-color-content-added,#a3d3ff); color: inherit; ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
	:addClass('diffchange-inline')
	:wikitext(token)		:wikitext(token)
	elseif status == SAME then		elseif status == SAME then

Jonesey95: sync with live module

2024-11-15T01:22:13Z

sync with live module

← Previous revision		Revision as of 01:22, 15 November 2024
Line 214:		Line 214:

	local tdSharedStyle = 'width: 48%; border-style: solid; border-radius: 0.33em; ' ..		local tdSharedStyle = 'width: 48%; border-style: solid; border-radius: 0.33em; ' ..
	'padding: 0.33em 0.5em; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..		'padding: 0.33em 0.5em; color: inherit; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..
	'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..		'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..
	'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these override default border-width for browsers that support them, needed for RTL UI on commons		'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these override default border-width for browsers that support them, needed for RTL UI on commons
Line 229:		Line 229:
	local deleted = tr		local deleted = tr
	:tag('td')		:tag('td')
	:cssText('border-color: #ffe49c; ' .. tdSharedStyle)		:cssText('border-color: var(--background-color-content-removed,#ffe49c); ' .. tdSharedStyle)
	:addClass('diff-deletedline')		:addClass('diff-deletedline')
	:tag('div')		:tag('div')
Line 240:		Line 240:
	deleted		deleted
	:tag('del')		:tag('del')
	:cssText('background: #~~feeec8~~; ' .. insDelSharedStyle)		:cssText('background: var(--background-color-content-removed,#ffe49c); color: inherit; ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
	:addClass('diffchange-inline')		:addClass('diffchange-inline')
Line 255:		Line 255:
	local inserted = tr		local inserted = tr
	:tag('td')		:tag('td')
	:cssText('border-color: #a3d3ff; ' .. tdSharedStyle)		:cssText('border-color: var(--background-color-content-added,#a3d3ff); ' .. tdSharedStyle)
	:addClass('diff-addedline')		:addClass('diff-addedline')
	:tag('div')		:tag('div')
Line 266:		Line 266:
	inserted		inserted
	:tag('ins')		:tag('ins')
	:cssText('background: #~~d8ecff~~; ' .. insDelSharedStyle)		:cssText('background: var(--background-color-content-added,#a3d3ff); color: inherit; ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
	:addClass('diffchange-inline')		:addClass('diffchange-inline')

Aaron Liu: testcases lie to me

2024-05-16T02:13:11Z

testcases lie to me

← Previous revision		Revision as of 02:13, 16 May 2024
Line 279:		Line 279:

	local function main(frame)		local function main(frame)
	return wikiDiff(mw.text.~~decodemw~~.text.unstrip((frame.args[1])), mw.text.decode(mw.text.unstrip(frame.args[2])), frame.args[3] or '[%s%.:-]+')		return wikiDiff(mw.text.decode(mw.text.unstrip(frame.args[1])), mw.text.decode(mw.text.unstrip(frame.args[2])), frame.args[3] or '[%s%.:-]+')
	end		end

Aaron Liu: sync and try to fix escapism

2024-05-16T02:09:01Z

sync and try to fix escapism

Jonesey95: sync with live template

2023-12-03T19:33:31Z

sync with live template

← Previous revision		Revision as of 19:33, 3 December 2023
Line 203:		Line 203:
	-- Wiki diff style, currently just for a line		-- Wiki diff style, currently just for a line
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
	local function wikiDiff(old, new, separator~~, opts~~)		local function wikiDiff(old, new, separator)
	opts = opts or {}
	local tokens = diff(old, new, separator)		local tokens = diff(old, new, separator)
	local root = mw.html.create('')		local root = mw.html.create('')
	root:wikitext(mw.getCurrentFrame():extensionTag('templatestyles', '', {src = 'Module:Diff/styles.css'}))

	local token, status		local token, status

			local plusMinusStyle = 'width: 2%; padding: 0.25em; font-weight: bold;' ..
	-- Override default border-width for browsers that support them.
			'font-size: 1.25em; text-align: end;'
	-- Needed for RTL support; forbidden in TemplateStyles.
	local ~~tdSharedStyle~~ = '-~~webkit-border-end-width~~: ~~1px~~; ~~-webkit-border-start-width~~: ~~4px~~; ' ..		local tdDivStyle = 'word-wrap: break-word; direction: ltr;'

⚫	'-~~moz~~-border-end-width: 1px; -~~moz~~-border-start-width: 4px;'
			local tdSharedStyle = 'width: 48%; border-style: solid; border-radius: 0.33em; ' ..

			'padding: 0.33em 0.5em; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..
	local is_different = false
		⚫	'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..
	for _, token_record in ipairs(tokens) do
			'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these overrides default border-width for browsers supports them, needed for RTL UI on commons
	if token_record[2] ~= SAME then
			local insDelSharedStyle = 'padding: 0.25em 0; font-weight: bold; text-decoration: initial;'
	is_different = true
	break
	end
	end

	local tbl = root:tag('table'):attr('lang', ''):addClass('diff')
	if (opts.oldTitle or opts.newTitle) then
	local tr = tbl:tag('tr')
⚫	tr:~~tag~~('th')
	:attr('scope', 'col')
	:attr('colspan', '2')
	:wikitext(opts.oldTitle)
	tr:tag('th')
	:attr('scope', 'col')
	:attr('colspan', '2')
	:wikitext(opts.newTitle)
	end

	local tr = ~~tbl~~:tag('tr')		local tr = root:tag('table'):addClass('diff'):css('width', '100%'):tag('tr')

	tr:tag('td')		tr:tag('td')
	:addClass('diff-marker')		:addClass('diff-marker')
			:cssText(plusMinusStyle)
	:wikitext(is_different and '−' or ' ')
		⚫	:wikitext('−')

	local deleted = tr		local deleted = tr
	:tag('td')		:tag('td')
	:cssText(tdSharedStyle)		:cssText('border-color: #ffe49c; ' .. tdSharedStyle)
	:addClass(~~is_different and~~ 'diff-deletedline~~' or 'diff-context~~')		:addClass('diff-deletedline')
	:tag('div')		:tag('div')
			:cssText(tdDivStyle)

	for i, token_record in ipairs(tokens) do		for i, token_record in ipairs(tokens) do
Line 255:		Line 240:
	deleted		deleted
	:tag('del')		:tag('del')
			:cssText('background: #feeec8; ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
	:addClass('diffchange-inline')		:addClass('diffchange-inline')
Line 264:		Line 250:

	tr:tag('td')		tr:tag('td')
	:~~addClass~~(~~'diff-marker'~~)		:cssText(plusMinusStyle)
	:wikitext(~~is_different and~~ '+~~' or ' ~~')		:wikitext('+')

	local inserted = tr		local inserted = tr
	:tag('td')		:tag('td')
	:cssText(tdSharedStyle)		:cssText('border-color: #a3d3ff; ' .. tdSharedStyle)
	:addClass(~~is_different and~~ 'diff-addedline~~' or 'diff-context~~')		:addClass('diff-addedline')
	:tag('div')		:tag('div')
			:cssText(tdDivStyle)

	for i, token_record in ipairs(tokens) do		for i, token_record in ipairs(tokens) do
Line 279:		Line 266:
	inserted		inserted
	:tag('ins')		:tag('ins')
			:cssText('background: #d8ecff; ' .. insDelSharedStyle)
	:addClass('diffchange')		:addClass('diffchange')
	:addClass('diffchange-inline')		:addClass('diffchange-inline')
Line 288:		Line 276:

	return tostring(root)		return tostring(root)
	end

	local function tidyVal(val)
	if ((type(val) == 'string') and (val == '')) then
	return nil
	end
	return val
	end		end

	local function main(frame)		local function main(frame)
			return wikiDiff(mw.text.unstrip(mw.text.decode(frame.args[1])), mw.text.decode(mw.text.unstrip(frame.args[2])), frame.args[3] or '[%s%.:-]+')
	local args = frame.args
	local pargs = (frame:getParent() or {}).args or {}
	return wikiDiff(
	mw.text.unstrip(mw.text.decode(args[1])),
	mw.text.unstrip(mw.text.decode(args[2])),
	frame.args[3] or '[%s%.:-]+',
	{
	oldTitle = tidyVal(args['1title']) or tidyVal(pargs['1title']),
	newTitle = tidyVal(args['2title']) or tidyVal(pargs['2title']),
	}
	)
	end		end

← Previous revision		Revision as of 02:09, 16 May 2024
Line 22:		Line 22:
	-- @param text A string to be split.		-- @param text A string to be split.
	-- @param separator [optional] the separator pattern (defaults to any		-- @param separator [optional] the separator pattern (defaults to any
	-- ~~white space~~ - %s+).		-- whitespace - %s+).
	-- @param skip_separator [optional] don't include the ~~sepator~~ in the results.		-- @param skip_separator [optional] don't include the separator in the results.
	-- @return A list of tokens.		-- @return A list of tokens.
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
Line 124:		Line 124:
	-- @param old The "old" text string		-- @param old The "old" text string
	-- @param new The "new" text string		-- @param new The "new" text string
	-- @param separator [optional] the separator pattern (defaults ot any		-- @param separator [optional] the separator pattern (defaults to any
	-- ~~white space~~).		-- whitespace).
	-- @return A list of annotated tokens.		-- @return A list of annotated tokens.
	-----------------------------------------------------------------------------		-----------------------------------------------------------------------------
Line 216:		Line 216:
	'padding: 0.33em 0.5em; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..		'padding: 0.33em 0.5em; font-size: 1em; font-family: monospace; white-space: pre-wrap; border-width: 1px 1px 1px 4px; ' ..
	'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..		'-webkit-border-end-width: 1px; -webkit-border-start-width: 4px; ' ..
	'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these ~~overrides~~ default border-width for browsers ~~supports~~ them, needed for RTL UI on commons		'-moz-border-end-width: 1px; -moz-border-start-width: 4px;' -- these override default border-width for browsers that support them, needed for RTL UI on commons
	local insDelSharedStyle = 'padding: 0.25em 0; font-weight: bold; text-decoration: initial;'		local insDelSharedStyle = 'padding: 0.25em 0; font-weight: bold; text-decoration: initial;'

Line 279:		Line 279:

	local function main(frame)		local function main(frame)
	return wikiDiff(mw.text.~~unstrip(mw~~.text.~~decode~~(frame.args[1])), mw.text.decode(mw.text.unstrip(frame.args[2])), frame.args[3] or '[%s%.:-]+')		return wikiDiff(mw.text.decodemw.text.unstrip((frame.args[1])), mw.text.decode(mw.text.unstrip(frame.args[2])), frame.args[3] or '[%s%.:-]+')
	end		end